diff --git a/RNTester/android/app/build.gradle b/RNTester/android/app/build.gradle index 4f0c9039c3..3af6284277 100644 --- a/RNTester/android/app/build.gradle +++ b/RNTester/android/app/build.gradle @@ -151,7 +151,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) // Build React Native from source - if (parent.parent == null) { + if (isSDXPlatform()) { implementation project(':react-native:ReactAndroid') } else { diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index 022271b9bc..bb3d8cdd36 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -346,6 +346,14 @@ android { } dependencies { + if (System.getenv("BUCK_BUILD") != "1") { + if (isSDXPlatform()) { + annotationProcessor project(':react-native:processory'); + } + else { + annotationProcessor project(':processor'); + } + } api("com.facebook.infer.annotation:infer-annotation:0.11.2") api("javax.inject:javax.inject:1") api("androidx.appcompat:appcompat:1.0.2") diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromObject.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromObject.java index 3f7f24bf02..2851765734 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromObject.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromObject.java @@ -7,7 +7,8 @@ package com.facebook.react.bridge; -import com.facebook.common.logging.FLog; +// Using Flog causes issue with Processor hence commenting its usage. +// import com.facebook.common.logging.FLog; import com.facebook.react.common.ReactConstants; import javax.annotation.Nullable; @@ -82,7 +83,7 @@ public class DynamicFromObject implements Dynamic { if (mObject instanceof ReadableArray) { return ReadableType.Array; } - FLog.e(ReactConstants.TAG, "Unmapped object type " + mObject.getClass().getName()); + // FLog.e(ReactConstants.TAG, "Unmapped object type " + mObject.getClass().getName()); return ReadableType.Null; } } diff --git a/build.gradle.kts b/build.gradle similarity index 86% rename from build.gradle.kts rename to build.gradle index 1595ba1e98..495a935ddc 100644 --- a/build.gradle.kts +++ b/build.gradle @@ -18,13 +18,13 @@ buildscript { } } -//fun isSDXPlatform():Boolean { -// if (parent == null) { -// return false; -// } +def isSDXPlatform() { + if (parent == null) { + return false; + } -// return true; -//} + return true; +} allprojects { diff --git a/processor/build.gradle b/processor/build.gradle index abba3025a1..32ed89312b 100644 --- a/processor/build.gradle +++ b/processor/build.gradle @@ -12,6 +12,7 @@ sourceSets { java { srcDirs = ['../ReactAndroid/src/main/java'] includes = [ + 'com/facebook/react/common/ReactConstants.java', 'com/facebook/react/processing/ReactNativeModuleProcessor.java', 'com/facebook/react/processing/ReactPropertyProcessor.java', 'com/facebook/react/bridge/Callback.java', @@ -22,6 +23,7 @@ sourceSets { 'com/facebook/react/bridge/WritableMap.java', 'com/facebook/react/bridge/WritableArray.java', 'com/facebook/react/bridge/Dynamic.java', + 'com/facebook/react/bridge/DynamicFromObject.java', 'com/facebook/react/bridge/ReactMethod.java', 'com/facebook/react/bridge/ReadableMapKeySetIterator.java', 'com/facebook/proguard/annotations/DoNotStrip.java',