diff --git a/RNTester/android/app/BUCK b/RNTester/android/app/BUCK index 29018a9d9..5e1c930d2 100644 --- 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 index cd34885c8..f25db3234 100644 --- 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 index c6d5f6e86..b4f95a646 100644 --- 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 index 6356bee89..3384b5871 100644 --- 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 index 242629969..34cc7fc50 100644 --- 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 index f6b335357..087a495fe 100644 --- 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 index edd32f268..6ee7ab605 100644 --- 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 index 1a7646351..699c6d418 100644 --- 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 index c68115b6e..58f43cdbe 100644 --- 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 index 924f26b0a..d2d61f016 100644 --- 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 index b2114fa69..de544f421 100644 --- 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 index 6aee2b52e..aaeb273ff 100644 --- 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 index b36ae88f2..58ff75834 100644 --- 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 index 1b8bc62dc..ab46348a5 100644 --- 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 index 5b91da250..a5e614b74 100644 --- 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 index 08bad8935..4762641fd 100644 --- 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 index 533d8aedb..db9e579df 100644 --- 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 index 38a0ff35a..ce0d06980 100644 --- 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 index 7dd35c98f..5d0528977 100644 --- 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 index e853d9cb4..b0e34dd26 100644 --- 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 index d6db0ab25..697db3b20 100644 --- 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 index d49f82c7f..914437f5c 100644 --- 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 index 168a8d1eb..2820f3f11 100644 --- 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 index 6f1895e07..121a38439 100644 --- 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 index 3889ca9ab..4af7b44c8 100644 --- 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 index e66439335..028c6a8d1 100644 --- 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 index aa229b304..87a951a81 100644 --- 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 index 61de25b42..e5deaad03 100644 --- 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", diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/BUCK index 3865b9edf..9445c2844 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/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 = "accessibilityinfo", srcs = glob(["**/*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/appregistry/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/appregistry/BUCK index 5f93f3b44..1f1f79925 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/appregistry/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/appregistry/BUCK @@ -1,6 +1,6 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_android_library", "react_native_target") -android_library( +rn_android_library( name = "appregistry", srcs = glob(["**/*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/BUCK index 16a73dedc..fe6aa03a7 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/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 = "appstate", srcs = glob(["**/*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK index ff188a87e..fc4b0159c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/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 = "blob", srcs = glob(["**/*.java"]), provided_deps = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/BUCK index b609a25f5..832628b90 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/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 = "camera", srcs = glob(["**/*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/BUCK index 32a22038d..a0917a8ad 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/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 = "clipboard", srcs = glob(["**/*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/common/BUCK index 33f853ec7..e8013a914 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/common/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/common/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 = "common", srcs = glob(["**/*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK index b3a6aaf95..843977979 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/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 = "core", srcs = glob(["**/*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK index 34f7508d0..d5231cf9e 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/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 = "datepicker", srcs = glob(["**/*.java"]), provided_deps = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/BUCK index 78c64da79..ed8eb9615 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/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 = "debug", srcs = glob(["*.java"]), visibility = [ @@ -19,7 +19,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/modules/deviceinfo/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK index 14f601585..db587702c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/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 = "deviceinfo", srcs = glob(["**/*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK index 1c42b0ae2..776053611 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/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 = "dialog", srcs = glob(["**/*.java"]), provided_deps = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK index eed0945b9..292759479 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/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 = "fresco", srcs = glob(["**/*.java"]), provided_deps = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/BUCK index 67b127bda..0830bde47 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/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 = "i18nmanager", srcs = glob(["*.java"]), provided_deps = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/image/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/image/BUCK index 5ae55e14b..511d7dce7 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/image/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/image/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 = "image", srcs = glob(["*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/intent/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/intent/BUCK index 8ac47bc95..3c806db7b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/intent/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/intent/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 = "intent", srcs = glob(["**/*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/location/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/location/BUCK index aae3c65e9..2e3058718 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/location/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/location/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 = "location", srcs = glob(["**/*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/BUCK index 5a70ac56d..03f2159b4 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/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 = "netinfo", srcs = glob(["**/*.java"]), provided_deps = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK index 7ecfea4c9..4ce467af9 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/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"]), provided_deps = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/BUCK index e4e219f16..1b17084ba 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/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 = "permissions", srcs = glob(["**/*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/share/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/share/BUCK index 5f4200625..bc0ed8676 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/share/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/share/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 = "share", srcs = glob(["**/*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK index b9e90e98b..ea7df6375 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/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 = "statusbar", srcs = glob(["**/*.java"]), provided_deps = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/BUCK index 7ff1ec13b..2a167374c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/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 = "storage", srcs = glob(["**/*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK index a967762f3..c271da003 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/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 = "systeminfo", srcs = [ "AndroidInfoModule.java", @@ -20,7 +20,7 @@ android_library( ], ) -android_library( +rn_android_library( name = "systeminfo-moduleless", srcs = [ "AndroidInfoHelpers.java", diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/BUCK index 6402249ae..004cc06f8 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/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 = "timepicker", srcs = glob(["**/*.java"]), provided_deps = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/toast/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/toast/BUCK index 557df4f36..d193897fb 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/toast/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/toast/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 = "toast", srcs = glob(["**/*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/BUCK index c9f524b5a..024416dd4 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/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 = "vibration", srcs = glob(["**/*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/BUCK index 6ea83d2e5..e91fcb9a2 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/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 = "websocket", srcs = glob(["**/*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/BUCK b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/BUCK index 605ae7481..ff7d61fee 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/BUCK @@ -1,6 +1,6 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "IS_OSS_BUILD", "rn_android_library", "react_native_dep", "react_native_target") -android_library( +rn_android_library( name = "packagerconnection", srcs = glob( ["**/*.java"], diff --git a/ReactAndroid/src/main/java/com/facebook/react/processing/BUCK b/ReactAndroid/src/main/java/com/facebook/react/processing/BUCK index 816ec02d5..8a72ba007 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/processing/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/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.processing.ReactPropertyProcessor", @@ -12,7 +12,7 @@ java_annotation_processor( ], ) -java_library( +rn_java_library( name = "processing-lib", srcs = glob(["*.java"]), source = "7", diff --git a/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK b/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK index 2b2a5ba1c..821191813 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/shell/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 = "shell", srcs = glob(["**/*.java"]), provided_deps = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/touch/BUCK b/ReactAndroid/src/main/java/com/facebook/react/touch/BUCK index fcda5cdfa..200b94f4d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/touch/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/touch/BUCK @@ -1,6 +1,6 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_android_library", "react_native_dep") -android_library( +rn_android_library( name = "touch", srcs = glob(["**/*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK index 5f528cb78..ff5fb92f6 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/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 = "uimanager", srcs = glob([ "*.java", diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK index 0e29b5df4..0a4a31531 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK @@ -1,6 +1,6 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_android_library", "react_native_dep") -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/uimanager/util/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/BUCK index 323a794bb..9d381de2d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/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 = "util", srcs = glob(["*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/util/BUCK b/ReactAndroid/src/main/java/com/facebook/react/util/BUCK index a159d59dd..918bc1d66 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/util/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/util/BUCK @@ -1,6 +1,6 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_android_library", "react_native_target") -android_library( +rn_android_library( name = "util", srcs = glob(["**/*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/art/BUCK index feaa666dc..6be869c6d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/art/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/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 = "art", srcs = glob(["*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/BUCK index 7162a0eb7..13c7d93cc 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/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 = "checkbox", srcs = glob(["*.java"]), provided_deps = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/common/BUCK index 5515d5174..127ff61dd 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/common/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/common/BUCK @@ -1,6 +1,6 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_android_library", "react_native_dep") -android_library( +rn_android_library( name = "common", srcs = glob(["*.java"]), provided_deps = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK index 15494de31..ad8b069d9 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/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 = "drawer", srcs = glob(["**/*.java"]), provided_deps = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK index 116dce94d..ef0c397da 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK @@ -1,10 +1,10 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_android_library", "react_native_dep", "react_native_target", "YOGA_TARGET") IMAGE_EVENT_FILES = [ "ImageLoadEvent.java", ] -android_library( +rn_android_library( name = "imageevents", srcs = IMAGE_EVENT_FILES, provided_deps = [ @@ -20,7 +20,7 @@ android_library( ], ) -android_library( +rn_android_library( name = "image", srcs = glob( ["*.java"], diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/BUCK index 27e36803a..e747bb3af 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/BUCK @@ -1,6 +1,6 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_android_library", "react_native_dep") -android_library( +rn_android_library( name = "imagehelper", srcs = glob( ["*.java"], @@ -15,7 +15,7 @@ android_library( ], ) -android_library( +rn_android_library( name = "withmultisource", srcs = ["MultiSourceHelper.java"], exported_deps = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK index eb762eb77..166c925a8 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/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 = "modal", srcs = glob(["*.java"]), required_for_source_only_abi = True, diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/picker/BUCK index 1b36cf587..35929ced9 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/picker/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 = "picker", srcs = glob(["**/*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/BUCK index d4112ff57..95fa32ec7 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/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 = "progressbar", srcs = glob(["*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK index e1e594d6b..013e2c478 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/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 = "scroll", srcs = glob(["*.java"]), provided_deps = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK index d8df70e57..c6acf3060 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/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 = "slider", srcs = glob(["*.java"]), provided_deps = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK index f3570c0a1..9f3a53f75 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/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 = "swiperefresh", srcs = glob(["*.java"]), provided_deps = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK index 16454ac87..741cffe61 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/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 = "switchview", srcs = glob(["*.java"]), provided_deps = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK index 23f63bf2e..08ad508ce 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/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 = "text", srcs = glob(["*.java"]), required_for_source_only_abi = True, diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/BUCK index c53a7de03..3df1cc82b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/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 = "frescosupport", srcs = glob(["*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK index 141713bc0..d1d46b200 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/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 = "textinput", srcs = glob(["*.java"]), provided_deps = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/BUCK index bcc3f9cc7..dfc17ada8 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/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 = "toolbar", srcs = glob(["**/*.java"]), provided_deps = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK index b5587be3d..95b48a234 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/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 = "view", srcs = glob(["*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/BUCK index 1763cda5d..b12fed0ff 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/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 = "viewpager", srcs = glob(["**/*.java"]), provided_deps = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/webview/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/webview/BUCK index e5edc8d94..fdbc50519 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/webview/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/webview/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 = "webview", srcs = glob(["**/*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/systrace/BUCK b/ReactAndroid/src/main/java/com/facebook/systrace/BUCK index c8edd72d0..8dd826b69 100644 --- a/ReactAndroid/src/main/java/com/facebook/systrace/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/systrace/BUCK @@ -1,6 +1,6 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_android_library") -android_library( +rn_android_library( name = "systrace", srcs = glob(["*.java"]), visibility = [ diff --git a/ReactAndroid/src/main/jni/first-party/fb/BUCK b/ReactAndroid/src/main/jni/first-party/fb/BUCK index 857551cc0..d43e4ebd4 100644 --- a/ReactAndroid/src/main/jni/first-party/fb/BUCK +++ b/ReactAndroid/src/main/jni/first-party/fb/BUCK @@ -1,27 +1,27 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "IS_OSS_BUILD", "cxx_library", "JNI_TARGET") # This target is only used in open source if IS_OSS_BUILD: - fb_xplat_cxx_library( - name = 'jni', - soname = 'libfb.$(ext)', - srcs = glob(['*.cpp', 'jni/*.cpp', 'lyra/*.cpp']), - header_namespace = '', - compiler_flags = [ - '-fno-omit-frame-pointer', - '-fexceptions', - '-Wall', - '-Werror', - '-std=c++11', - '-DDISABLE_CPUCAP', - '-DDISABLE_XPLAT', - ], - exported_headers = subdir_glob([ - ('include', 'fb/**/*.h'), - ('include', 'jni/*.h'), - ]), - deps = [ - JNI_TARGET, - ], - visibility = ['PUBLIC'], - ) + cxx_library( + name = 'jni', + soname = 'libfb.$(ext)', + srcs = glob(['*.cpp', 'jni/*.cpp', 'lyra/*.cpp']), + header_namespace = '', + compiler_flags = [ + '-fno-omit-frame-pointer', + '-fexceptions', + '-Wall', + '-Werror', + '-std=c++11', + '-DDISABLE_CPUCAP', + '-DDISABLE_XPLAT', + ], + exported_headers = subdir_glob([ + ('include', 'fb/**/*.h'), + ('include', 'jni/*.h'), + ]), + deps = [ + JNI_TARGET, + ], + visibility = ['PUBLIC'], + ) diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/java/BUCK b/ReactAndroid/src/main/jni/first-party/fb/jni/java/BUCK index c1bdbb70e..cd59e63e4 100644 --- a/ReactAndroid/src/main/jni/first-party/fb/jni/java/BUCK +++ b/ReactAndroid/src/main/jni/first-party/fb/jni/java/BUCK @@ -1,5 +1,3 @@ -include_defs("//ReactAndroid/DEFS") - java_library( name = "java", srcs = glob(["**/*.java"]), diff --git a/ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK b/ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK index 0a8cc7667..7622e4ad8 100644 --- a/ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK +++ b/ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK @@ -1,8 +1,6 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "cxx_library", "GLOG_DEP") -include_defs("//ReactCommon/DEFS") - -fb_xplat_cxx_library( +cxx_library( name = "fbgloginit", srcs = [ "glog_init.cpp", diff --git a/ReactAndroid/src/main/jni/first-party/jni-hack/BUCK b/ReactAndroid/src/main/jni/first-party/jni-hack/BUCK index 269650e65..67bbb4277 100644 --- a/ReactAndroid/src/main/jni/first-party/jni-hack/BUCK +++ b/ReactAndroid/src/main/jni/first-party/jni-hack/BUCK @@ -1,4 +1,4 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "cxx_library") # Copyright (c) 2014-present, Facebook, Inc. # All rights reserved. @@ -7,7 +7,7 @@ include_defs("//ReactAndroid/DEFS") # LICENSE file in the root directory of this source tree. An additional grant # of patent rights can be found in the PATENTS file in the same directory. -fb_xplat_cxx_library( +cxx_library( name = "jni-hack", header_namespace = "", exported_headers = [ diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/BUCK b/ReactAndroid/src/main/jni/first-party/yogajni/BUCK index b7fbdb563..822414cbc 100644 --- a/ReactAndroid/src/main/jni/first-party/yogajni/BUCK +++ b/ReactAndroid/src/main/jni/first-party/yogajni/BUCK @@ -1,23 +1,23 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "IS_OSS_BUILD", "cxx_library", "FBJNI_TARGET") # This target is only used in open source if IS_OSS_BUILD: - fb_xplat_cxx_library( - name = 'jni', - soname = 'libyoga.$(ext)', - srcs = glob(['jni/*.cpp']), - header_namespace = '', - compiler_flags = [ - '-fno-omit-frame-pointer', - '-fexceptions', - '-Wall', - '-Werror', - '-O3', - '-std=c++11', - ], - deps = [ - '//ReactCommon/yoga:yoga', - FBJNI_TARGET, - ], - visibility = ['PUBLIC'], - ) + cxx_library( + name = 'jni', + soname = 'libyoga.$(ext)', + srcs = glob(['jni/*.cpp']), + header_namespace = '', + compiler_flags = [ + '-fno-omit-frame-pointer', + '-fexceptions', + '-Wall', + '-Werror', + '-O3', + '-std=c++11', + ], + deps = [ + '//ReactCommon/yoga:yoga', + FBJNI_TARGET, + ], + visibility = ['PUBLIC'], + ) diff --git a/ReactAndroid/src/main/jni/packagerconnection/BUCK b/ReactAndroid/src/main/jni/packagerconnection/BUCK index b9df88168..ee11def4d 100644 --- a/ReactAndroid/src/main/jni/packagerconnection/BUCK +++ b/ReactAndroid/src/main/jni/packagerconnection/BUCK @@ -1,6 +1,6 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "cxx_library", "FBJNI_TARGET", "ANDROID_JSC_DEPS", "APPLE_JSC_DEPS", "IS_OSS_BUILD", "react_native_xplat_target") -fb_xplat_cxx_library( +cxx_library( name = "jni", srcs = glob(["*.cpp"]), headers = glob( @@ -14,6 +14,8 @@ fb_xplat_cxx_library( "-std=c++1y", "-frtti", ], + fbandroid_deps = ANDROID_JSC_DEPS, + fbobjc_deps = APPLE_JSC_DEPS, preprocessor_flags = [ "-DLOG_TAG=\"PackagerConnectionJNI\"", "-DWITH_FBSYSTRACE=1", @@ -28,5 +30,5 @@ fb_xplat_cxx_library( "xplat//folly:molly", react_native_xplat_target("jschelpers:jschelpers"), react_native_xplat_target("jsinspector:jsinspector"), - ] + JSC_DEPS) if not IS_OSS_BUILD else [], + ]) if not IS_OSS_BUILD else [], ) diff --git a/ReactAndroid/src/main/jni/prebuilt/BUCK b/ReactAndroid/src/main/jni/prebuilt/BUCK index f4b0b17b2..3eae6dd07 100644 --- a/ReactAndroid/src/main/jni/prebuilt/BUCK +++ b/ReactAndroid/src/main/jni/prebuilt/BUCK @@ -1,5 +1,3 @@ -include_defs("//ReactAndroid/DEFS") - # Temp workaround to get the build working e2e, Gradle builds them for us prebuilt_native_library( diff --git a/ReactAndroid/src/main/jni/react/jni/BUCK b/ReactAndroid/src/main/jni/react/jni/BUCK index a9570b425..c85ecba58 100644 --- a/ReactAndroid/src/main/jni/react/jni/BUCK +++ b/ReactAndroid/src/main/jni/react/jni/BUCK @@ -1,4 +1,4 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "cxx_library", "react_native_xplat_target", "FBJNI_TARGET", "ANDROID_JSC_DEPS", "APPLE_JSC_DEPS", "IS_OSS_BUILD") EXPORTED_HEADERS = [ "AndroidJSCFactory.h", @@ -20,7 +20,7 @@ EXPORTED_HEADERS = [ "WritableNativeMap.h", ] -fb_xplat_cxx_library( +cxx_library( name = "jni", srcs = glob(["*.cpp"]), headers = glob( @@ -29,7 +29,6 @@ fb_xplat_cxx_library( ), header_namespace = "react/jni", exported_headers = EXPORTED_HEADERS, - allow_jni_merging = True, compiler_flags = [ "-Wall", "-Werror", @@ -39,6 +38,9 @@ fb_xplat_cxx_library( "-Wno-pessimizing-move", "-Wno-inconsistent-missing-override", ], + fbandroid_allow_jni_merging = True, + fbandroid_deps = ANDROID_JSC_DEPS, + fbobjc_deps = APPLE_JSC_DEPS, preprocessor_flags = [ "-DLOG_TAG=\"ReactNativeJNI\"", "-DWITH_FBSYSTRACE=1", @@ -50,12 +52,12 @@ fb_xplat_cxx_library( "PUBLIC", ], deps = ([ - "//native/third-party/android-ndk:android", + "xplat//third-party/linker_lib:android", "xplat//folly:molly", - "//xplat/fbgloginit:fbgloginit", + "fbandroid//xplat/fbgloginit:fbgloginit", "xplat//fbsystrace:fbsystrace", react_native_xplat_target("cxxreact:bridge"), react_native_xplat_target("cxxreact:module"), FBJNI_TARGET, - ] + JSC_DEPS) if not IS_OSS_BUILD else [], + ]) if not IS_OSS_BUILD else [], ) diff --git a/ReactAndroid/src/main/jni/react/perftests/BUCK b/ReactAndroid/src/main/jni/react/perftests/BUCK index 55f21e6f9..f6c920c90 100644 --- a/ReactAndroid/src/main/jni/react/perftests/BUCK +++ b/ReactAndroid/src/main/jni/react/perftests/BUCK @@ -1,6 +1,6 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "cxx_library", "react_native_xplat_target") -fb_xplat_cxx_library( +cxx_library( name = "perftests", srcs = ["OnLoad.cpp"], compiler_flags = [ @@ -9,12 +9,12 @@ fb_xplat_cxx_library( ], soname = "libnativereactperftests.$(ext)", visibility = [ - "//instrumentation_tests/com/facebook/react/...", + "fbandroid//instrumentation_tests/com/facebook/react/...", ], deps = [ + "fbandroid//native:base", + "fbandroid//native/fb:fb", "xplat//folly:molly", - "//native:base", - "//native/fb:fb", react_native_xplat_target("cxxreact:module"), ], ) diff --git a/ReactAndroid/src/main/jni/third-party/android-ndk/BUCK b/ReactAndroid/src/main/jni/third-party/android-ndk/BUCK index 54f646815..294dfed94 100644 --- a/ReactAndroid/src/main/jni/third-party/android-ndk/BUCK +++ b/ReactAndroid/src/main/jni/third-party/android-ndk/BUCK @@ -1,5 +1,3 @@ -include_defs("//ReactAndroid/DEFS") - # NOTE(agallagher): The platform should really be responsible for providing # this type of implicit dependency. As it is now, we need to setup a dummy # rules to model the Android NDK's built in libraries. diff --git a/ReactAndroid/src/main/jni/third-party/glibc/BUCK b/ReactAndroid/src/main/jni/third-party/glibc/BUCK index 4355e013c..666895384 100644 --- a/ReactAndroid/src/main/jni/third-party/glibc/BUCK +++ b/ReactAndroid/src/main/jni/third-party/glibc/BUCK @@ -1,5 +1,3 @@ -include_defs("//ReactAndroid/DEFS") - # NOTE(agallagher): The platform really should be responsible for providing # this type of provided dependency. As it is now, we need to setup dummy # rules to model glibc's libraries. diff --git a/ReactAndroid/src/main/libraries/fbcore/src/main/java/com/facebook/common/logging/BUCK b/ReactAndroid/src/main/libraries/fbcore/src/main/java/com/facebook/common/logging/BUCK index 22cf9e0ff..b6a7fbe43 100644 --- a/ReactAndroid/src/main/libraries/fbcore/src/main/java/com/facebook/common/logging/BUCK +++ b/ReactAndroid/src/main/libraries/fbcore/src/main/java/com/facebook/common/logging/BUCK @@ -1,6 +1,6 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_android_library", "react_native_dep") -android_library( +rn_android_library( name = "logging", exported_deps = [ react_native_dep("libraries/fresco/fresco-react-native:fbcore"), diff --git a/ReactAndroid/src/main/libraries/fbcore/src/test/java/com/facebook/powermock/BUCK b/ReactAndroid/src/main/libraries/fbcore/src/test/java/com/facebook/powermock/BUCK index 08ca06adc..d868e4d0c 100644 --- a/ReactAndroid/src/main/libraries/fbcore/src/test/java/com/facebook/powermock/BUCK +++ b/ReactAndroid/src/main/libraries/fbcore/src/test/java/com/facebook/powermock/BUCK @@ -1,6 +1,6 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_android_library") -android_library( +rn_android_library( name = "powermock", exported_deps = [ ":javassist", diff --git a/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK b/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK index 0f36aa0c3..c55b43929 100644 --- a/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK +++ b/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK @@ -1,4 +1,4 @@ -include_defs("//ReactAndroid/DEFS") +load("@xplat//ReactNative:DEFS", "rn_android_library") android_prebuilt_aar( name = "fresco-react-native", @@ -24,7 +24,7 @@ remote_file( url = "mvn:com.facebook.fresco:drawee:aar:1.3.0", ) -android_library( +rn_android_library( name = "imagepipeline", exported_deps = [ ":bolts", diff --git a/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK b/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK index 0f34debe0..c91ded296 100644 --- a/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK +++ b/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK @@ -1,5 +1,3 @@ -include_defs("//ReactAndroid/DEFS") - android_prebuilt_aar( name = "soloader", aar = ":soloader-binary-aar", diff --git a/ReactAndroid/src/main/libraries/textlayoutbuilder/BUCK b/ReactAndroid/src/main/libraries/textlayoutbuilder/BUCK index 094becc99..4eb76fa66 100644 --- a/ReactAndroid/src/main/libraries/textlayoutbuilder/BUCK +++ b/ReactAndroid/src/main/libraries/textlayoutbuilder/BUCK @@ -1,6 +1,6 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_android_library") -android_library( +rn_android_library( name = "textlayoutbuilder", exported_deps = [ ":staticlayoutproxy", diff --git a/ReactAndroid/src/main/res/BUCK b/ReactAndroid/src/main/res/BUCK index 43e7dcabd..1df270d57 100644 --- a/ReactAndroid/src/main/res/BUCK +++ b/ReactAndroid/src/main/res/BUCK @@ -1,15 +1,17 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_android_resource", "react_native_target", "android_react_native_target", "apple_react_native_target") -android_resource( +rn_android_resource( name = "devsupport", package = "com.facebook.react", res = "devsupport", visibility = [ react_native_target("java/com/facebook/react/devsupport/..."), + android_react_native_target("java/com/facebook/react/devsupport/..."), + apple_react_native_target("java/com/facebook/react/devsupport/..."), ], ) -android_resource( +rn_android_resource( name = "shell", package = "com.facebook.react", res = "shell", @@ -18,7 +20,7 @@ android_resource( ], ) -android_resource( +rn_android_resource( name = "modal", package = "com.facebook.react", res = "views/modal", @@ -27,7 +29,7 @@ android_resource( ], ) -android_resource( +rn_android_resource( name = "uimanager", package = "com.facebook.react", res = "views/uimanager", diff --git a/ReactAndroid/src/main/third-party/android/support-annotations/BUCK b/ReactAndroid/src/main/third-party/android/support-annotations/BUCK index e79ad6ede..bc18a5b27 100644 --- a/ReactAndroid/src/main/third-party/android/support-annotations/BUCK +++ b/ReactAndroid/src/main/third-party/android/support-annotations/BUCK @@ -1,5 +1,3 @@ -include_defs("//ReactAndroid/DEFS") - prebuilt_jar( name = "android-support-annotations", binary_jar = ":support-annotations-binary-aar", diff --git a/ReactAndroid/src/main/third-party/android/support/v4/BUCK b/ReactAndroid/src/main/third-party/android/support/v4/BUCK index 99f926d20..92f542214 100644 --- a/ReactAndroid/src/main/third-party/android/support/v4/BUCK +++ b/ReactAndroid/src/main/third-party/android/support/v4/BUCK @@ -1,5 +1,3 @@ -include_defs("//ReactAndroid/DEFS") - android_prebuilt_aar( name = "lib-support-v4", aar = ":lib-support-v4-binary-aar", diff --git a/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK b/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK index 7049cba5f..67df210a9 100644 --- a/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK +++ b/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK @@ -1,15 +1,15 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_android_library", "rn_android_resource") # This is a bit messy and hopefully a temporary thing # The problem is that Gradle extracts appcompat resources into app namespace, com.facebook.react # While BUCK behaves properly and extracts them into android.support.v7.appcompat package. # We want to support both Gradle and BUCK builds so we hack a bit how BUCK extracts resources. -# Besides that we still need JAVA classes from appcompat-v7.aar, that is why android_library +# Besides that we still need JAVA classes from appcompat-v7.aar, that is why rn_android_library # extracts classes.jar but the trick is that we can't take full appcompat.aar because resources # extracted from it by BUCK would conflict with resources we use under Gradelified package # All this mumbo jumbo will go away after t10182713 -android_library( +rn_android_library( name = "appcompat", exported_deps = [ ":classes-for-react-native", @@ -23,7 +23,7 @@ android_library( ) # still used by appcompat library internally, so we need both during the build -android_resource( +rn_android_resource( name = "res-for-appcompat", package = "android.support.v7.appcompat", res = ":res-unpacker-cmd", diff --git a/ReactAndroid/src/main/third-party/java/asm/BUCK b/ReactAndroid/src/main/third-party/java/asm/BUCK index c1dc66d37..5e19fad45 100644 --- a/ReactAndroid/src/main/third-party/java/asm/BUCK +++ b/ReactAndroid/src/main/third-party/java/asm/BUCK @@ -1,6 +1,6 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_android_library") -android_library( +rn_android_library( name = "asm", exported_deps = [ ":asm-analysis", diff --git a/ReactAndroid/src/main/third-party/java/buck-android-support/BUCK b/ReactAndroid/src/main/third-party/java/buck-android-support/BUCK index 1283d1155..aa9df9fe0 100644 --- a/ReactAndroid/src/main/third-party/java/buck-android-support/BUCK +++ b/ReactAndroid/src/main/third-party/java/buck-android-support/BUCK @@ -1,4 +1,4 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "react_native_integration_tests_target") # this lib was compiled by buck version : 6cbf2709778ea352a169d1c84e3ef2894dfa39ec prebuilt_jar( diff --git a/ReactAndroid/src/main/third-party/java/fest/BUCK b/ReactAndroid/src/main/third-party/java/fest/BUCK index 97e046d96..20db58b9b 100644 --- a/ReactAndroid/src/main/third-party/java/fest/BUCK +++ b/ReactAndroid/src/main/third-party/java/fest/BUCK @@ -1,6 +1,6 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_android_library") -android_library( +rn_android_library( name = "fest", exported_deps = [ ":fest-core", diff --git a/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK b/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK index 7cd48fda7..548d17fe7 100644 --- a/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK +++ b/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK @@ -1,5 +1,3 @@ -include_defs("//ReactAndroid/DEFS") - prebuilt_jar( name = "infer-annotations", binary_jar = "infer-annotations-4.0.jar", diff --git a/ReactAndroid/src/main/third-party/java/javapoet/BUCK b/ReactAndroid/src/main/third-party/java/javapoet/BUCK index c8e0f0c91..00541500c 100644 --- a/ReactAndroid/src/main/third-party/java/javapoet/BUCK +++ b/ReactAndroid/src/main/third-party/java/javapoet/BUCK @@ -1,5 +1,3 @@ -include_defs("//ReactAndroid/DEFS") - prebuilt_jar( name = "javapoet", binary_jar = ":jsr305-binary-jar", diff --git a/ReactAndroid/src/main/third-party/java/jsr-305/BUCK b/ReactAndroid/src/main/third-party/java/jsr-305/BUCK index a5b298dcb..f6a5d730f 100644 --- a/ReactAndroid/src/main/third-party/java/jsr-305/BUCK +++ b/ReactAndroid/src/main/third-party/java/jsr-305/BUCK @@ -1,5 +1,3 @@ -include_defs("//ReactAndroid/DEFS") - prebuilt_jar( name = "jsr-305", binary_jar = ":jsr305-binary-jar", diff --git a/ReactAndroid/src/main/third-party/java/jsr-330/BUCK b/ReactAndroid/src/main/third-party/java/jsr-330/BUCK index 0ac598451..79a1f76be 100644 --- a/ReactAndroid/src/main/third-party/java/jsr-330/BUCK +++ b/ReactAndroid/src/main/third-party/java/jsr-330/BUCK @@ -1,5 +1,3 @@ -include_defs("//ReactAndroid/DEFS") - prebuilt_jar( name = "jsr-330", binary_jar = ":jsr330-binary-jar", diff --git a/ReactAndroid/src/main/third-party/java/junit/BUCK b/ReactAndroid/src/main/third-party/java/junit/BUCK index b61778c19..2f930277b 100644 --- a/ReactAndroid/src/main/third-party/java/junit/BUCK +++ b/ReactAndroid/src/main/third-party/java/junit/BUCK @@ -1,6 +1,6 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_android_library") -android_library( +rn_android_library( name = "junit", exported_deps = [ ":hamcrest", diff --git a/ReactAndroid/src/main/third-party/java/mockito/BUCK b/ReactAndroid/src/main/third-party/java/mockito/BUCK index acef6890a..4fae26bc8 100644 --- a/ReactAndroid/src/main/third-party/java/mockito/BUCK +++ b/ReactAndroid/src/main/third-party/java/mockito/BUCK @@ -1,6 +1,6 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_android_library") -android_library( +rn_android_library( name = "mockito", exported_deps = [ ":mockito-core", diff --git a/ReactAndroid/src/main/third-party/java/okhttp/BUCK b/ReactAndroid/src/main/third-party/java/okhttp/BUCK index 4ae5c80cc..b02f14861 100644 --- a/ReactAndroid/src/main/third-party/java/okhttp/BUCK +++ b/ReactAndroid/src/main/third-party/java/okhttp/BUCK @@ -1,5 +1,3 @@ -include_defs("//ReactAndroid/DEFS") - prebuilt_jar( name = "okhttp3", binary_jar = ":okhttp3-binary-jar", diff --git a/ReactAndroid/src/main/third-party/java/okio/BUCK b/ReactAndroid/src/main/third-party/java/okio/BUCK index ca797eead..45955117a 100644 --- a/ReactAndroid/src/main/third-party/java/okio/BUCK +++ b/ReactAndroid/src/main/third-party/java/okio/BUCK @@ -1,5 +1,3 @@ -include_defs("//ReactAndroid/DEFS") - prebuilt_jar( name = "okio", binary_jar = ":okio-binary-jar", diff --git a/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK b/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK index d285355ca..b0016207e 100644 --- a/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK +++ b/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK @@ -1,6 +1,6 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_android_library", "react_native_dep") -android_library( +rn_android_library( name = "robolectric", exported_deps = [ ":android-all-4.1.2_r1-robolectric-0", diff --git a/ReactAndroid/src/main/third-party/java/sqlite/BUCK b/ReactAndroid/src/main/third-party/java/sqlite/BUCK index 5045c0015..40780872d 100644 --- a/ReactAndroid/src/main/third-party/java/sqlite/BUCK +++ b/ReactAndroid/src/main/third-party/java/sqlite/BUCK @@ -1,6 +1,6 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_android_library") -android_library( +rn_android_library( name = "sqlite", exported_deps = [ ":sqlite4java", diff --git a/ReactAndroid/src/main/third-party/java/testing-support-lib/BUCK b/ReactAndroid/src/main/third-party/java/testing-support-lib/BUCK index 81d8cde91..9b9ec7008 100644 --- a/ReactAndroid/src/main/third-party/java/testing-support-lib/BUCK +++ b/ReactAndroid/src/main/third-party/java/testing-support-lib/BUCK @@ -1,5 +1,3 @@ -include_defs("//ReactAndroid/DEFS") - android_prebuilt_aar( name = "runner", aar = ":testing-support-lib-runner-download", diff --git a/ReactAndroid/src/test/java/com/facebook/common/logging/BUCK b/ReactAndroid/src/test/java/com/facebook/common/logging/BUCK index 47baec24f..eb4b36caa 100644 --- a/ReactAndroid/src/test/java/com/facebook/common/logging/BUCK +++ b/ReactAndroid/src/test/java/com/facebook/common/logging/BUCK @@ -1,6 +1,6 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_android_library", "react_native_dep") -android_library( +rn_android_library( name = "logging", srcs = glob(["**/*.java"]), exported_deps = [ diff --git a/ReactAndroid/src/test/java/com/facebook/react/BUCK b/ReactAndroid/src/test/java/com/facebook/react/BUCK index 2869733b5..37db2b423 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/BUCK +++ b/ReactAndroid/src/test/java/com/facebook/react/BUCK @@ -1,4 +1,4 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_robolectric_test", "YOGA_TARGET", "react_native_dep", "react_native_target", "react_native_tests_target") rn_robolectric_test( name = "react", diff --git a/ReactAndroid/src/test/java/com/facebook/react/animated/BUCK b/ReactAndroid/src/test/java/com/facebook/react/animated/BUCK index 4a175cc5a..edb0e60cc 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/animated/BUCK +++ b/ReactAndroid/src/test/java/com/facebook/react/animated/BUCK @@ -1,4 +1,4 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_robolectric_test", "react_native_dep", "react_native_target", "react_native_tests_target") rn_robolectric_test( name = "animated", diff --git a/ReactAndroid/src/test/java/com/facebook/react/bridge/BUCK b/ReactAndroid/src/test/java/com/facebook/react/bridge/BUCK index b7650485f..7aa746a5b 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/bridge/BUCK +++ b/ReactAndroid/src/test/java/com/facebook/react/bridge/BUCK @@ -1,10 +1,10 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_android_library", "react_native_dep", "react_native_target", "rn_robolectric_test", "react_native_tests_target") STANDARD_TEST_SRCS = [ "*Test.java", ] -android_library( +rn_android_library( name = "testhelpers", srcs = glob( ["*.java"], diff --git a/ReactAndroid/src/test/java/com/facebook/react/devsupport/BUCK b/ReactAndroid/src/test/java/com/facebook/react/devsupport/BUCK index 29fb02c91..cc09a03f1 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/devsupport/BUCK +++ b/ReactAndroid/src/test/java/com/facebook/react/devsupport/BUCK @@ -1,4 +1,4 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_robolectric_test", "react_native_dep", "react_native_target", "react_native_tests_target") rn_robolectric_test( name = "devsupport", diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK b/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK index dcccaf7a5..6dbf90b65 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK +++ b/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK @@ -1,4 +1,4 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_robolectric_test", "YOGA_TARGET", "react_native_dep", "react_native_target", "react_native_tests_target") rn_robolectric_test( name = "modules", diff --git a/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/BUCK b/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/BUCK index f56ff3ac7..03dcf50ca 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/BUCK +++ b/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/BUCK @@ -1,4 +1,4 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_robolectric_test", "react_native_dep", "react_native_target") rn_robolectric_test( name = "packagerconnection", diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/BUCK b/ReactAndroid/src/test/java/com/facebook/react/uimanager/BUCK index 2a5345604..283494c8b 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/BUCK +++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/BUCK @@ -1,4 +1,4 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_robolectric_test", "YOGA_TARGET", "react_native_dep", "react_native_target", "react_native_tests_target") rn_robolectric_test( name = "uimanager", diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/BUCK b/ReactAndroid/src/test/java/com/facebook/react/views/BUCK index 595a0abbd..33eebaf60 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/views/BUCK +++ b/ReactAndroid/src/test/java/com/facebook/react/views/BUCK @@ -1,4 +1,4 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_robolectric_test", "YOGA_TARGET", "react_native_dep", "react_native_target", "react_native_tests_target") rn_robolectric_test( name = "views", diff --git a/ReactAndroid/src/test/java/org/mockito/configuration/BUCK b/ReactAndroid/src/test/java/org/mockito/configuration/BUCK index b0ef32b58..777a89c9e 100644 --- a/ReactAndroid/src/test/java/org/mockito/configuration/BUCK +++ b/ReactAndroid/src/test/java/org/mockito/configuration/BUCK @@ -1,6 +1,6 @@ -include_defs("//ReactAndroid/DEFS") +load("//ReactNative:DEFS", "rn_android_library", "react_native_dep") -android_library( +rn_android_library( name = "configuration", srcs = glob(["**/*.java"]), visibility = [ diff --git a/ReactCommon/DEFS b/ReactCommon/DEFS deleted file mode 100644 index 140e9b2ff..000000000 --- a/ReactCommon/DEFS +++ /dev/null @@ -1,24 +0,0 @@ -# Set up common deps - -# Building is not supported in OSS right now -def rn_xplat_cxx_library(name, **kwargs): - cxx_library(name, **kwargs) -# Helper for referring to an Android RN target -def react_native_target(path): - return '//ReactAndroid/src/main/' + path - -# Helper for referring to an xplat RN target -def react_native_xplat_target(path): - return '//ReactCommon/' + path - -GLOG_DEP = "//ReactAndroid/build/third-party-ndk/glog:glog" - -INSPECTOR_FLAGS = [] -DEBUG_PREPROCESSOR_FLAGS = [] -STATIC_LIBRARY_IOS_FLAGS = [] - -JSC_DEPS = [] -JSC_INTERNAL_DEPS = [] - -THIS_IS_FBOBJC = False -THIS_IS_FBANDROID = False diff --git a/ReactCommon/cxxreact/BUCK b/ReactCommon/cxxreact/BUCK index 48fbb110f..8dcbc432b 100644 --- a/ReactCommon/cxxreact/BUCK +++ b/ReactCommon/cxxreact/BUCK @@ -1,15 +1,15 @@ -include_defs("xplat//configurations/buck/apple/flag_defs.bzl") - -include_defs("//ReactCommon/DEFS") +load("//ReactNative:DEFS", "IS_OSS_BUILD", "rn_xplat_cxx_library", "ANDROID_INSPECTOR_FLAGS", "APPLE_INSPECTOR_FLAGS", "ANDROID_JSC_DEPS", "APPLE_JSC_DEPS", "DEBUG_PREPROCESSOR_FLAGS", "react_native_xplat_target") CXX_LIBRARY_COMPILER_FLAGS = [ "-std=c++14", "-Wall", ] -if THIS_IS_FBOBJC: - inherited_buck_flags = STATIC_LIBRARY_IOS_FLAGS - CXX_LIBRARY_COMPILER_FLAGS += flags.get_flag_value(inherited_buck_flags, 'compiler_flags') +APPLE_COMPILER_FLAGS = [] + +if not IS_OSS_BUILD: + load("@xplat//configurations/buck/apple:flag_defs.bzl", "STATIC_LIBRARY_IOS_FLAGS", "flags") + APPLE_COMPILER_FLAGS = flags.get_flag_value(STATIC_LIBRARY_IOS_FLAGS, 'compiler_flags') rn_xplat_cxx_library( name = "module", @@ -23,6 +23,7 @@ rn_xplat_cxx_library( prefix = "cxxreact", ), compiler_flags = CXX_LIBRARY_COMPILER_FLAGS, + fbobjc_compiler_flags = APPLE_COMPILER_FLAGS, force_static = True, visibility = [ "PUBLIC", @@ -46,6 +47,7 @@ rn_xplat_cxx_library( "-fexceptions", "-frtti", ], + fbobjc_compiler_flags = APPLE_COMPILER_FLAGS, force_static = True, visibility = [ "PUBLIC", @@ -66,6 +68,7 @@ rn_xplat_cxx_library( "-fno-omit-frame-pointer", "-fexceptions", ], + fbobjc_compiler_flags = APPLE_COMPILER_FLAGS, soname = "libxplat_react_module_samplemodule.$(ext)", visibility = [ "PUBLIC", @@ -124,31 +127,33 @@ rn_xplat_cxx_library( "-fexceptions", "-frtti", ], - fbandroid_preprocessor_flags = [ + fbandroid_deps = ANDROID_JSC_DEPS, + fbandroid_preprocessor_flags = ANDROID_INSPECTOR_FLAGS + [ "-DWITH_JSC_EXTRA_TRACING=1", "-DWITH_JSC_MEMORY_PRESSURE=1", "-DWITH_FB_MEMORY_PROFILING=1", ], + fbobjc_compiler_flags = APPLE_COMPILER_FLAGS, + fbobjc_deps = APPLE_JSC_DEPS, fbobjc_frameworks = [ "$SDKROOT/System/Library/Frameworks/JavaScriptCore.framework", ], - fbobjc_inherited_buck_flags = STATIC_LIBRARY_IOS_FLAGS, - fbobjc_preprocessor_flags = DEBUG_PREPROCESSOR_FLAGS, + fbobjc_preprocessor_flags = DEBUG_PREPROCESSOR_FLAGS + APPLE_INSPECTOR_FLAGS, force_static = True, preprocessor_flags = [ "-DLOG_TAG=\"ReactNative\"", "-DWITH_FBSYSTRACE=1", - ] + INSPECTOR_FLAGS, + ], tests = [ react_native_xplat_target("cxxreact/tests:tests"), ], visibility = ["PUBLIC"], deps = [ - ":module", - ":jsbigstring", "xplat//fbsystrace:fbsystrace", "xplat//folly:headers_only", "xplat//folly:molly", + ":jsbigstring", + ":module", react_native_xplat_target("jschelpers:jschelpers"), react_native_xplat_target("jsinspector:jsinspector"), react_native_xplat_target("microprofiler:microprofiler"), @@ -156,5 +161,5 @@ rn_xplat_cxx_library( "xplat//third-party/glog:glog", react_native_xplat_target("jschelpers:jscinternalhelpers"), react_native_xplat_target("privatedata:privatedata"), - ] + JSC_DEPS, + ], ) diff --git a/ReactCommon/cxxreact/tests/BUCK b/ReactCommon/cxxreact/tests/BUCK index f20321d66..1ae86ec59 100644 --- a/ReactCommon/cxxreact/tests/BUCK +++ b/ReactCommon/cxxreact/tests/BUCK @@ -1,3 +1,5 @@ +load("//ReactNative:DEFS", "IS_OSS_BUILD", "react_native_xplat_target") + TEST_SRCS = [ "RecoverableErrorTest.cpp", "jsarg_helpers.cpp", @@ -8,40 +10,45 @@ TEST_SRCS = [ "value.cpp", ] -if THIS_IS_FBANDROID: - include_defs('//ReactAndroid/DEFS') - include_defs('//ReactAndroid/TEST_DEFS') - jni_instrumentation_test_lib( - name = 'tests', - class_under_test = 'com/facebook/react/XplatBridgeTest', - soname = 'libxplat-bridge.so', - srcs = TEST_SRCS, - compiler_flags = [ - '-fexceptions', - '-frtti', - '-std=c++14', - ], - deps = [ - '//native/third-party/android-ndk:android', - 'xplat//third-party/gmock:gtest', - react_native_xplat_target('cxxreact:bridge'), - ], - visibility = ['//instrumentation_tests/...'], - ) +if not IS_OSS_BUILD: + load("@xplat//configurations/buck/android:jni_instrumentation_test", "jni_instrumentation_test_lib") + load("@xplat//configurations/buck:fb_xplat_cxx", "cxx_test") + load("@xplat//configurations/buck:default_platform_defs.bzl", "APPLE") + jni_instrumentation_test_lib( + name = 'tests', + class_under_test = 'com/facebook/react/XplatBridgeTest', + soname = 'libxplat-bridge.so', + srcs = TEST_SRCS, + compiler_flags = [ + '-fexceptions', + '-frtti', + '-std=c++14', + ], + deps = [ + 'xplat//third-party/linker_lib:android', + 'xplat//third-party/gmock:gtest', + react_native_xplat_target('cxxreact:bridge'), + ], + visibility = [ + 'fbandroid//instrumentation_tests/...' + ], + ) -if THIS_IS_FBOBJC: - fb_xplat_cxx_test( - name = 'tests', - srcs = TEST_SRCS, - compiler_flags = [ - '-fexceptions', - '-frtti', - ], - deps = [ - 'xplat//folly:molly', - 'xplat//third-party/gmock:gtest', - react_native_xplat_target('cxxreact:bridge'), - react_native_xplat_target('jschelpers:jschelpers'), - ], - visibility = [react_native_xplat_target('cxxreact/...')], - ) + cxx_test( + name = 'tests', + srcs = TEST_SRCS, + compiler_flags = [ + '-fexceptions', + '-frtti', + ], + platforms = APPLE, + deps = [ + 'xplat//folly:molly', + 'xplat//third-party/gmock:gtest', + react_native_xplat_target('cxxreact:bridge'), + react_native_xplat_target('jschelpers:jschelpers'), + ], + visibility = [ + react_native_xplat_target('cxxreact/...'), + ], + ) diff --git a/ReactCommon/jschelpers/BUCK b/ReactCommon/jschelpers/BUCK index ab53fbfb1..6e7bdec10 100644 --- a/ReactCommon/jschelpers/BUCK +++ b/ReactCommon/jschelpers/BUCK @@ -1,6 +1,4 @@ -include_defs("xplat//configurations/buck/apple/flag_defs.bzl") - -include_defs("//ReactCommon/DEFS") +load("//ReactNative:DEFS", "rn_xplat_cxx_library", "react_native_xplat_target", "ANDROID_JSC_INTERNAL_DEPS", "APPLE_JSC_INTERNAL_DEPS") EXPORTED_HEADERS = [ "JavaScriptCore.h", @@ -39,12 +37,13 @@ rn_xplat_cxx_library( exported_deps = [ react_native_xplat_target("privatedata:privatedata"), ], - fbobjc_inherited_buck_flags = STATIC_LIBRARY_IOS_FLAGS, + fbandroid_deps = ANDROID_JSC_INTERNAL_DEPS, + fbobjc_deps = APPLE_JSC_INTERNAL_DEPS, force_static = True, visibility = [ "PUBLIC", ], - deps = JSC_INTERNAL_DEPS + [ + deps = [ "xplat//folly:molly", "xplat//third-party/glog:glog", react_native_xplat_target("privatedata:privatedata"), @@ -63,7 +62,6 @@ rn_xplat_cxx_library( fbobjc_frameworks = [ "$SDKROOT/System/Library/Frameworks/JavaScriptCore.framework", ], - fbobjc_inherited_buck_flags = STATIC_LIBRARY_IOS_FLAGS, fbobjc_srcs = ["systemJSCWrapper.cpp"], force_static = True, visibility = [ diff --git a/ReactCommon/jsinspector/BUCK b/ReactCommon/jsinspector/BUCK index 8cd407356..d6f5b33f4 100644 --- a/ReactCommon/jsinspector/BUCK +++ b/ReactCommon/jsinspector/BUCK @@ -1,4 +1,4 @@ -include_defs("//ReactCommon/DEFS") +load("//ReactNative:DEFS", "rn_xplat_cxx_library") EXPORTED_HEADERS = [ "InspectorInterfaces.h", @@ -9,12 +9,21 @@ rn_xplat_cxx_library( srcs = glob( ["*.cpp"], ), - headers = glob( - ["*.h"], + headers = subdir_glob( + [ + ("", "*.h"), + ], excludes = EXPORTED_HEADERS, + prefix = "jsinspector", + ), + header_namespace = "", + exported_headers = subdir_glob( + [ + ("", header) + for header in EXPORTED_HEADERS + ], + prefix = "jsinspector", ), - header_namespace = "jsinspector", - exported_headers = EXPORTED_HEADERS, compiler_flags = [ "-Wall", "-fexceptions", diff --git a/ReactCommon/microprofiler/BUCK b/ReactCommon/microprofiler/BUCK index b1c15c02a..1013bf146 100644 --- a/ReactCommon/microprofiler/BUCK +++ b/ReactCommon/microprofiler/BUCK @@ -1,6 +1,6 @@ -include_defs("//ReactCommon/DEFS") +load("//ReactNative:DEFS", "cxx_library", "GLOG_DEP") -fb_xplat_cxx_library( +cxx_library( name = "microprofiler", srcs = [ "MicroProfiler.cpp", diff --git a/ReactCommon/privatedata/BUCK b/ReactCommon/privatedata/BUCK index a22a1eaab..7ee27f5ff 100644 --- a/ReactCommon/privatedata/BUCK +++ b/ReactCommon/privatedata/BUCK @@ -1,4 +1,4 @@ -include_defs("//ReactCommon/DEFS") +load("//ReactNative:DEFS", "rn_xplat_cxx_library") rn_xplat_cxx_library( name = "privatedata", diff --git a/ReactCommon/yoga/BUCK b/ReactCommon/yoga/BUCK index 3fb56b336..ed393265a 100644 --- a/ReactCommon/yoga/BUCK +++ b/ReactCommon/yoga/BUCK @@ -1,4 +1,4 @@ -include_defs("//ReactCommon/DEFS") +load("//ReactNative:DEFS", "rn_xplat_cxx_library") rn_xplat_cxx_library( name = "yoga", diff --git a/ReactAndroid/DEFS b/ReactNative/DEFS similarity index 77% rename from ReactAndroid/DEFS rename to ReactNative/DEFS index a594df919..2685a8b99 100644 --- a/ReactAndroid/DEFS +++ b/ReactNative/DEFS @@ -6,13 +6,42 @@ IS_OSS_BUILD = True +GLOG_DEP = "//ReactAndroid/build/third-party-ndk/glog:glog" + +INSPECTOR_FLAGS = [] +DEBUG_PREPROCESSOR_FLAGS = [] + +APPLE_JSC_INTERNAL_DEPS = [] +APPLE_JSC_DEPS = [] + +ANDROID_JSC_INTERNAL_DEPS = [ + '//native/third-party/jsc:jsc', + '//native/third-party/jsc:jsc_legacy_profiler', +] +ANDROID_JSC_DEPS = ANDROID_JSC_INTERNAL_DEPS + +YOGA_TARGET = '//ReactAndroid/src/main/java/com/facebook:yoga' +FBGLOGINIT_TARGET = '//ReactAndroid/src/main/jni/first-party/fbgloginit:fbgloginit' +FBJNI_TARGET = '//ReactAndroid/src/main/jni/first-party/fb:jni' +JNI_TARGET = '//ReactAndroid/src/main/jni/first-party/jni-hack:jni-hack' + with allow_unsafe_import(): import os +# Building is not supported in OSS right now +def rn_xplat_cxx_library(name, **kwargs): + cxx_library(name = name) + # Example: react_native_target('java/com/facebook/react/common:common') def react_native_target(path): return '//ReactAndroid/src/main/' + path +def android_react_native_target(path): + return react_native_target(path) + +def apple_react_native_target(path): + return react_native_target(path) + # Example: react_native_xplat_target('bridge:bridge') def react_native_xplat_target(path): return '//ReactCommon/' + path @@ -30,20 +59,8 @@ def react_native_integration_tests_target(path): def react_native_dep(path): return '//ReactAndroid/src/main/' + path -JSC_INTERNAL_DEPS = [ - '//native/third-party/jsc:jsc', - '//native/third-party/jsc:jsc_legacy_profiler', -] -JSC_DEPS = JSC_INTERNAL_DEPS - -YOGA_TARGET = '//ReactAndroid/src/main/java/com/facebook:yoga' -FBGLOGINIT_TARGET = '//ReactAndroid/src/main/jni/first-party/fbgloginit:fbgloginit' -FBJNI_TARGET = '//ReactAndroid/src/main/jni/first-party/fb:jni' -JNI_TARGET = '//ReactAndroid/src/main/jni/first-party/jni-hack:jni-hack' - # React property preprocessor -original_android_library=android_library -def android_library( +def rn_android_library( name, deps=[], plugins=[], @@ -64,13 +81,28 @@ def android_library( plugins = list(set(plugins + react_module_plugins)) - original_android_library( + android_library( name=name, deps=deps, plugins=plugins, *args, **kwargs) +def rn_android_binary(*args, **kwargs): + android_binary(*args, **kargs) + +def rn_android_build_config(*args, **kwargs): + android_build_config(*args, **kargs) + +def rn_android_resource(*args, **kwargs): + android_resource(*args, **kwargs) + +def rn_java_library(*args, **kwargs): + java_library(*args, **kargs) + +def rn_java_annotation_processor(*args, **kwargs): + java_annotation_processor(*args, **kwargs) + def rn_robolectric_test(name, srcs, vm_args = None, *args, **kwargs): vm_args = vm_args or [] @@ -108,6 +140,8 @@ def rn_robolectric_test(name, srcs, vm_args = None, *args, **kwargs): vm_args = vm_args + extra_vm_args, *args, **kwargs) - -def fb_xplat_cxx_library(allow_jni_merging=None, **kwargs): - cxx_library(**kwargs) +original_cxx_library = cxx_library +def cxx_library(allow_jni_merging=None, **kwargs): + kwargs.pop('fbandroid_deps', []) + kwargs.pop('fbobjc_deps', []) + original_cxx_library(**kwargs)