Make xplat react native files buildable

Reviewed By: mzlee Differential Revision: D6605611 fbshipit-source-id: baa33947319a27b95020924d177a9398a276dabe
facebook · Jan 22, 2018 · 4f2cc42 · 4f2cc42
1 parent cec2e80
commit 4f2cc42
Show file tree

Hide file tree

Showing 138 changed files with 461 additions and 462 deletions.
diff --git a/RNTester/android/app/BUCK b/RNTester/android/app/BUCK
@@ -1,6 +1,6 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_android_library", "rn_android_binary", "rn_android_resource", "react_native_dep", "react_native_target")
 
-android_binary(
+rn_android_binary(
     name = "app",
     keystore = "//keystores:debug",
     manifest = "src/main/AndroidManifest.xml",
@@ -9,7 +9,7 @@ android_binary(
     ],
 )
 
-android_library(
+rn_android_library(
     name = "rntester-lib",
     srcs = glob(["src/main/java/**/*.java"]),
     deps = [
@@ -26,7 +26,7 @@ android_library(
     ],
 )
 
-android_resource(
+rn_android_resource(
     name = "res",
     package = "com.facebook.react.uiapp",
     res = "src/main/res",

diff --git a/ReactAndroid/libs/BUCK b/ReactAndroid/libs/BUCK
@@ -1,5 +1,3 @@
-include_defs("//ReactAndroid/DEFS")
-
 android_prebuilt_aar(
     name = "appcompat",
     aar = ":appcompat-binary-aar",

diff --git a/ReactAndroid/src/androidTest/assets/BUCK b/ReactAndroid/src/androidTest/assets/BUCK
@@ -1,6 +1,6 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_android_resource")
 
-android_resource(
+rn_android_resource(
     name = "assets",
     assets = ".",
     visibility = ["PUBLIC"],

diff --git a/ReactAndroid/src/androidTest/buck-runner/BUCK b/ReactAndroid/src/androidTest/buck-runner/BUCK
@@ -1,4 +1,4 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_android_binary", "react_native_dep", "react_native_integration_tests_target", "react_native_target")
 
 # We are running instrumentation tests in simple mode: app code and instrumentation are in the same APK
 # Currently you need to run these commands to execute tests:
@@ -7,7 +7,7 @@ include_defs("//ReactAndroid/DEFS")
 # gradle :ReactAndroid:packageReactNdkLibsForBuck
 # buck install ReactAndroid/src/androidTest/buck-runner:instrumentation-tests
 # ./scripts/run-android-instrumentation-tests.sh com.facebook.react.tests
-android_binary(
+rn_android_binary(
     name = "instrumentation-tests",
     keystore = "//keystores:debug",
     manifest = "AndroidManifest.xml",

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
@@ -1,6 +1,6 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_android_library", "react_native_dep", "react_native_integration_tests_target", "react_native_target")
 
-android_library(
+rn_android_library(
     name = "testing",
     srcs = glob(
         ["**/*.java"],

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK
@@ -1,6 +1,6 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_android_library", "react_native_dep", "react_native_target")
 
-android_library(
+rn_android_library(
     name = "idledetection",
     srcs = glob(["**/*.java"]),
     visibility = [

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/BUCK
@@ -1,6 +1,6 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_android_library", "react_native_dep", "react_native_target")
 
-android_library(
+rn_android_library(
     name = "network",
     srcs = glob(["**/*.java"]),
     visibility = [

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
@@ -1,41 +1,39 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_android_library", "react_native_dep", "react_native_integration_tests_target", "react_native_target")
 
-deps = [
-    react_native_dep("third-party/android/support/v4:lib-support-v4"),
-    react_native_dep("third-party/java/jsr-305:jsr-305"),
-    react_native_dep("third-party/java/junit:junit"),
-    react_native_integration_tests_target("java/com/facebook/react/testing:testing"),
-    react_native_integration_tests_target("java/com/facebook/react/testing/idledetection:idledetection"),
-    react_native_target("java/com/facebook/react:react"),
-    react_native_target("java/com/facebook/react/bridge:bridge"),
-    react_native_target("java/com/facebook/react/common:common"),
-    react_native_target("java/com/facebook/react/module/annotations:annotations"),
-    react_native_target("java/com/facebook/react/modules/appstate:appstate"),
-    react_native_target("java/com/facebook/react/modules/core:core"),
-    react_native_target("java/com/facebook/react/modules/datepicker:datepicker"),
-    react_native_target("java/com/facebook/react/modules/deviceinfo:deviceinfo"),
-    react_native_target("java/com/facebook/react/modules/share:share"),
-    react_native_target("java/com/facebook/react/modules/systeminfo:systeminfo"),
-    react_native_target("java/com/facebook/react/modules/timepicker:timepicker"),
-    react_native_target("java/com/facebook/react/touch:touch"),
-    react_native_target("java/com/facebook/react/uimanager:uimanager"),
-    react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
-    react_native_target("java/com/facebook/react/uimanager/util:util"),
-    react_native_target("java/com/facebook/react/views/picker:picker"),
-    react_native_target("java/com/facebook/react/views/progressbar:progressbar"),
-    react_native_target("java/com/facebook/react/views/scroll:scroll"),
-    react_native_target("java/com/facebook/react/views/slider:slider"),
-    react_native_target("java/com/facebook/react/views/swiperefresh:swiperefresh"),
-    react_native_target("java/com/facebook/react/views/text:text"),
-    react_native_target("java/com/facebook/react/views/textinput:textinput"),
-    react_native_target("java/com/facebook/react/views/view:view"),
-]
-
-android_library(
+rn_android_library(
     name = "tests",
     srcs = glob(["**/*.java"]),
     visibility = [
         "PUBLIC",
     ],
-    deps = deps,
+    deps = [
+        react_native_dep("third-party/android/support/v4:lib-support-v4"),
+        react_native_dep("third-party/java/jsr-305:jsr-305"),
+        react_native_dep("third-party/java/junit:junit"),
+        react_native_integration_tests_target("java/com/facebook/react/testing:testing"),
+        react_native_integration_tests_target("java/com/facebook/react/testing/idledetection:idledetection"),
+        react_native_target("java/com/facebook/react:react"),
+        react_native_target("java/com/facebook/react/bridge:bridge"),
+        react_native_target("java/com/facebook/react/common:common"),
+        react_native_target("java/com/facebook/react/module/annotations:annotations"),
+        react_native_target("java/com/facebook/react/modules/appstate:appstate"),
+        react_native_target("java/com/facebook/react/modules/core:core"),
+        react_native_target("java/com/facebook/react/modules/datepicker:datepicker"),
+        react_native_target("java/com/facebook/react/modules/deviceinfo:deviceinfo"),
+        react_native_target("java/com/facebook/react/modules/share:share"),
+        react_native_target("java/com/facebook/react/modules/systeminfo:systeminfo"),
+        react_native_target("java/com/facebook/react/modules/timepicker:timepicker"),
+        react_native_target("java/com/facebook/react/touch:touch"),
+        react_native_target("java/com/facebook/react/uimanager:uimanager"),
+        react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
+        react_native_target("java/com/facebook/react/uimanager/util:util"),
+        react_native_target("java/com/facebook/react/views/picker:picker"),
+        react_native_target("java/com/facebook/react/views/progressbar:progressbar"),
+        react_native_target("java/com/facebook/react/views/scroll:scroll"),
+        react_native_target("java/com/facebook/react/views/slider:slider"),
+        react_native_target("java/com/facebook/react/views/swiperefresh:swiperefresh"),
+        react_native_target("java/com/facebook/react/views/text:text"),
+        react_native_target("java/com/facebook/react/views/textinput:textinput"),
+        react_native_target("java/com/facebook/react/views/view:view"),
+    ],
 )
diff --git a/ReactAndroid/src/main/android_res/com/facebook/catalyst/appcompat/BUCK b/ReactAndroid/src/main/android_res/com/facebook/catalyst/appcompat/BUCK
@@ -1,8 +1,8 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_android_resource", "react_native_dep")
 
 # used by ReactToolbarManager because of Gradle
 # TODO t10182713 will be replaced with appcompat-orig when we stop using Gradle
-android_resource(
+rn_android_resource(
     name = "appcompat",
     package = "com.facebook.react",
     res = react_native_dep("third-party/android/support/v7/appcompat-orig:res-unpacker-cmd"),

diff --git a/ReactAndroid/src/main/java/com/facebook/BUCK b/ReactAndroid/src/main/java/com/facebook/BUCK
@@ -1,6 +1,6 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_android_library", "react_native_dep")
 
-android_library(
+rn_android_library(
     name = "yoga",
     srcs = glob(["yoga/*.java"]),
     visibility = ["PUBLIC"],

diff --git a/ReactAndroid/src/main/java/com/facebook/debug/debugoverlay/model/BUCK b/ReactAndroid/src/main/java/com/facebook/debug/debugoverlay/model/BUCK
@@ -1,6 +1,6 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_android_library", "react_native_dep")
 
-android_library(
+rn_android_library(
     name = "model",
     srcs = glob(["*.java"]),
     visibility = [

diff --git a/ReactAndroid/src/main/java/com/facebook/debug/holder/BUCK b/ReactAndroid/src/main/java/com/facebook/debug/holder/BUCK
@@ -1,6 +1,6 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_android_library", "react_native_dep")
 
-android_library(
+rn_android_library(
     name = "holder",
     srcs = glob(["*.java"]),
     exported_deps = [

diff --git a/ReactAndroid/src/main/java/com/facebook/debug/tags/BUCK b/ReactAndroid/src/main/java/com/facebook/debug/tags/BUCK
@@ -1,6 +1,6 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_android_library", "react_native_dep")
 
-android_library(
+rn_android_library(
     name = "tags",
     srcs = glob(["*.java"]),
     exported_deps = [

diff --git a/ReactAndroid/src/main/java/com/facebook/jni/BUCK b/ReactAndroid/src/main/java/com/facebook/jni/BUCK
@@ -1,6 +1,6 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_android_library", "react_native_dep")
 
-android_library(
+rn_android_library(
     name = "jni",
     srcs = glob(["**/*.java"]),
     proguard_config = "fbjni.pro",

diff --git a/ReactAndroid/src/main/java/com/facebook/perftest/BUCK b/ReactAndroid/src/main/java/com/facebook/perftest/BUCK
@@ -1,6 +1,6 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_android_library")
 
-android_library(
+rn_android_library(
     name = "perftest",
     srcs = glob(["*.java"]),
     visibility = [

diff --git a/ReactAndroid/src/main/java/com/facebook/proguard/annotations/BUCK b/ReactAndroid/src/main/java/com/facebook/proguard/annotations/BUCK
@@ -1,6 +1,6 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_android_library")
 
-android_library(
+rn_android_library(
     name = "annotations",
     srcs = glob(["*.java"]),
     proguard_config = "proguard_annotations.pro",

diff --git a/ReactAndroid/src/main/java/com/facebook/react/BUCK b/ReactAndroid/src/main/java/com/facebook/react/BUCK
@@ -1,6 +1,6 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_android_library", "react_native_dep", "react_native_target")
 
-android_library(
+rn_android_library(
     name = "react",
     srcs = glob(["*.java"]),
     provided_deps = [

diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK b/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK
@@ -1,6 +1,6 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_android_library", "react_native_dep", "react_native_target")
 
-android_library(
+rn_android_library(
     name = "animated",
     srcs = glob([
         "*.java",

diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/BUCK b/ReactAndroid/src/main/java/com/facebook/react/animation/BUCK
@@ -1,6 +1,6 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_android_library", "react_native_dep", "react_native_target")
 
-android_library(
+rn_android_library(
     name = "animation",
     srcs = glob(["**/*.java"]),
     visibility = [

diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK
@@ -1,6 +1,6 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_android_library", "react_native_dep", "react_native_target", "IS_OSS_BUILD")
 
-android_library(
+rn_android_library(
     name = "bridge",
     srcs = glob(["**/*.java"]),
     exported_deps = [

diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/common/BUCK
@@ -1,10 +1,10 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_android_library", "rn_android_build_config", "react_native_dep")
 
 SUB_PROJECTS = [
     "network/**/*",
 ]
 
-android_library(
+rn_android_library(
     name = "common",
     srcs = glob(
         ["**/*.java"],
@@ -28,7 +28,7 @@ android_library(
     ],
 )
 
-android_build_config(
+rn_android_build_config(
     name = "build_config",
     package = "com.facebook.react",
     values = [

diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/network/BUCK b/ReactAndroid/src/main/java/com/facebook/react/common/network/BUCK
@@ -1,6 +1,6 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_android_library", "react_native_dep")
 
-android_library(
+rn_android_library(
     name = "network",
     srcs = glob(["**/*.java"]),
     visibility = [

diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK
@@ -1,6 +1,6 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_android_library", "react_native_dep", "react_native_target")
 
-android_library(
+rn_android_library(
     name = "devsupport",
     srcs = glob(["*.java"]),
     manifest = "AndroidManifest.xml",
@@ -30,7 +30,7 @@ android_library(
     ],
 )
 
-android_library(
+rn_android_library(
     name = "interfaces",
     srcs = glob(["interfaces/*.java"]),
     visibility = [

diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/BUCK b/ReactAndroid/src/main/java/com/facebook/react/flat/BUCK
@@ -1,6 +1,6 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_android_library", "YOGA_TARGET", "react_native_dep", "react_native_target")
 
-android_library(
+rn_android_library(
     name = "flat",
     srcs = glob(["*.java"]),
     provided_deps = [

diff --git a/ReactAndroid/src/main/java/com/facebook/react/jstasks/BUCK b/ReactAndroid/src/main/java/com/facebook/react/jstasks/BUCK
@@ -1,19 +1,17 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_android_library", "react_native_dep", "react_native_target")
 
-DEPS = [
-    react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
-    react_native_dep("third-party/java/infer-annotations:infer-annotations"),
-    react_native_dep("third-party/java/jsr-305:jsr-305"),
-    react_native_target("java/com/facebook/react/bridge:bridge"),
-    react_native_target("java/com/facebook/react/common:common"),
-    react_native_target("java/com/facebook/react/modules/appregistry:appregistry"),
-]
-
-android_library(
+rn_android_library(
     name = "jstasks",
     srcs = glob(["*.java"]),
     visibility = [
         "PUBLIC",
     ],
-    deps = DEPS,
+    deps = [
+        react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
+        react_native_dep("third-party/java/infer-annotations:infer-annotations"),
+        react_native_dep("third-party/java/jsr-305:jsr-305"),
+        react_native_target("java/com/facebook/react/bridge:bridge"),
+        react_native_target("java/com/facebook/react/common:common"),
+        react_native_target("java/com/facebook/react/modules/appregistry:appregistry"),
+    ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK b/ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK
@@ -1,6 +1,6 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_android_library", "react_native_dep", "react_native_target")
 
-android_library(
+rn_android_library(
     name = "annotations",
     srcs = glob(["**/*.java"]),
     required_for_source_only_abi = True,

diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/model/BUCK b/ReactAndroid/src/main/java/com/facebook/react/module/model/BUCK
@@ -1,6 +1,6 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_android_library", "react_native_dep")
 
-android_library(
+rn_android_library(
     name = "model",
     srcs = glob(["**/*.java"]),
     visibility = [

diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/processing/BUCK b/ReactAndroid/src/main/java/com/facebook/react/module/processing/BUCK
@@ -1,6 +1,6 @@
-include_defs("//ReactAndroid/DEFS")
+load("//ReactNative:DEFS", "rn_java_annotation_processor", "rn_java_library", "react_native_dep", "react_native_target")
 
-java_annotation_processor(
+rn_java_annotation_processor(
     name = "processing",
     does_not_affect_abi = True,
     processor_class = "com.facebook.react.module.processing.ReactModuleSpecProcessor",
@@ -12,7 +12,7 @@ java_annotation_processor(
     ],
 )
 
-java_library(
+rn_java_library(
     name = "processing-lib",
     srcs = glob(["*.java"]),
     source = "8",