From c458242d871714f1fb79f6c9fecbde6b7dafa01b Mon Sep 17 00:00:00 2001 From: Taras Tsugrii Date: Thu, 10 Jan 2019 19:57:40 -0800 Subject: [PATCH] Reformat xplat build files according to new formatting rules. Summary: drop-conflicts Reviewed By: zertosh Differential Revision: D13610808 fbshipit-source-id: 52c2a90bba3d9b0ac383f6e4a76b4fb3e60bf382 --- ReactAndroid/libs/BUCK | 2 +- ReactAndroid/src/main/jni/prebuilt/BUCK | 3 +-- .../fbcore/src/test/java/com/facebook/powermock/BUCK | 2 +- .../src/main/libraries/fresco/fresco-react-native/BUCK | 2 +- .../src/main/third-party/android/support-annotations/BUCK | 2 +- ReactAndroid/src/main/third-party/android/support/BUCK | 2 +- .../main/third-party/android/support/v7/appcompat-orig/BUCK | 2 +- ReactAndroid/src/main/third-party/java/asm/BUCK | 2 +- .../src/main/third-party/java/buck-android-support/BUCK | 2 +- ReactAndroid/src/main/third-party/java/fest/BUCK | 2 +- ReactAndroid/src/main/third-party/java/infer-annotations/BUCK | 2 +- ReactAndroid/src/main/third-party/java/javapoet/BUCK | 2 +- ReactAndroid/src/main/third-party/java/junit/BUCK | 2 +- ReactAndroid/src/main/third-party/java/mockito/BUCK | 2 +- ReactAndroid/src/main/third-party/java/okhttp/BUCK | 2 +- ReactAndroid/src/main/third-party/java/okio/BUCK | 2 +- .../src/main/third-party/java/robolectric3/robolectric/BUCK | 2 +- ReactAndroid/src/main/third-party/java/sqlite/BUCK | 2 +- .../src/main/third-party/java/testing-support-lib/BUCK | 2 +- ReactCommon/config/BUCK | 4 ++-- codegen/BUCK | 2 +- 21 files changed, 22 insertions(+), 23 deletions(-) diff --git a/ReactAndroid/libs/BUCK b/ReactAndroid/libs/BUCK index d02386960..a360e7e86 100644 --- a/ReactAndroid/libs/BUCK +++ b/ReactAndroid/libs/BUCK @@ -1,5 +1,5 @@ -load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_prebuilt_aar") load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") +load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_prebuilt_aar") rn_android_prebuilt_aar( name = "appcompat", diff --git a/ReactAndroid/src/main/jni/prebuilt/BUCK b/ReactAndroid/src/main/jni/prebuilt/BUCK index 4d8a9f13b..1c0a24b0d 100644 --- a/ReactAndroid/src/main/jni/prebuilt/BUCK +++ b/ReactAndroid/src/main/jni/prebuilt/BUCK @@ -1,7 +1,6 @@ -load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_prebuilt_aar", "rn_prebuilt_native_library") - # Temp workaround to get the build working e2e, Gradle builds them for us load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") +load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_prebuilt_aar", "rn_prebuilt_native_library") rn_prebuilt_native_library( name = "reactnative-libs", 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 25a1d35c9..1473f92d1 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,5 +1,5 @@ -load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar") load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") +load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar") rn_android_library( name = "powermock", diff --git a/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK b/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK index a92713410..223cce857 100644 --- a/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK +++ b/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK @@ -1,5 +1,5 @@ -load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_android_prebuilt_aar", "rn_prebuilt_jar") load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") +load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_android_prebuilt_aar", "rn_prebuilt_jar") rn_android_prebuilt_aar( name = "fresco-react-native", diff --git a/ReactAndroid/src/main/third-party/android/support-annotations/BUCK b/ReactAndroid/src/main/third-party/android/support-annotations/BUCK index 841b4692b..904540a1e 100644 --- a/ReactAndroid/src/main/third-party/android/support-annotations/BUCK +++ b/ReactAndroid/src/main/third-party/android/support-annotations/BUCK @@ -1,5 +1,5 @@ -load("//tools/build_defs/oss:rn_defs.bzl", "rn_prebuilt_jar") load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") +load("//tools/build_defs/oss:rn_defs.bzl", "rn_prebuilt_jar") rn_prebuilt_jar( name = "android-support-annotations", diff --git a/ReactAndroid/src/main/third-party/android/support/BUCK b/ReactAndroid/src/main/third-party/android/support/BUCK index a0a3444e0..2c67956ac 100644 --- a/ReactAndroid/src/main/third-party/android/support/BUCK +++ b/ReactAndroid/src/main/third-party/android/support/BUCK @@ -1,5 +1,5 @@ -load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library") load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") +load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library") rn_android_library( name = "support-v4", 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 ed227826e..c33036be8 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,5 +1,5 @@ -load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library", "rn_android_resource", "rn_genrule", "rn_prebuilt_jar") load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") +load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library", "rn_android_resource", "rn_genrule", "rn_prebuilt_jar") # This is a bit messy and hopefully a temporary thing # The problem is that Gradle extracts appcompat resources into app namespace, com.facebook.react diff --git a/ReactAndroid/src/main/third-party/java/asm/BUCK b/ReactAndroid/src/main/third-party/java/asm/BUCK index 6f1c58322..c56db5422 100644 --- a/ReactAndroid/src/main/third-party/java/asm/BUCK +++ b/ReactAndroid/src/main/third-party/java/asm/BUCK @@ -1,5 +1,5 @@ -load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar") load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") +load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar") rn_android_library( name = "asm", 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 7bf884056..8fea3737c 100644 --- a/ReactAndroid/src/main/third-party/java/buck-android-support/BUCK +++ b/ReactAndroid/src/main/third-party/java/buck-android-support/BUCK @@ -1,5 +1,5 @@ -load("//tools/build_defs/oss:rn_defs.bzl", "react_native_integration_tests_target") load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") +load("//tools/build_defs/oss:rn_defs.bzl", "react_native_integration_tests_target") # this lib was compiled by buck version : 6cbf2709778ea352a169d1c84e3ef2894dfa39ec fb_native.prebuilt_jar( diff --git a/ReactAndroid/src/main/third-party/java/fest/BUCK b/ReactAndroid/src/main/third-party/java/fest/BUCK index a0115e44f..10f995f16 100644 --- a/ReactAndroid/src/main/third-party/java/fest/BUCK +++ b/ReactAndroid/src/main/third-party/java/fest/BUCK @@ -1,5 +1,5 @@ -load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar") load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") +load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar") rn_android_library( name = "fest", diff --git a/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK b/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK index 6e55893d5..9cf53d29a 100644 --- a/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK +++ b/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK @@ -1,5 +1,5 @@ -load("//tools/build_defs/oss:rn_defs.bzl", "rn_prebuilt_jar") load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") +load("//tools/build_defs/oss:rn_defs.bzl", "rn_prebuilt_jar") rn_prebuilt_jar( name = "infer-annotations", diff --git a/ReactAndroid/src/main/third-party/java/javapoet/BUCK b/ReactAndroid/src/main/third-party/java/javapoet/BUCK index 5c20e06fc..3a50a70a4 100644 --- a/ReactAndroid/src/main/third-party/java/javapoet/BUCK +++ b/ReactAndroid/src/main/third-party/java/javapoet/BUCK @@ -1,5 +1,5 @@ -load("//tools/build_defs/oss:rn_defs.bzl", "rn_prebuilt_jar") load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") +load("//tools/build_defs/oss:rn_defs.bzl", "rn_prebuilt_jar") rn_prebuilt_jar( name = "javapoet", diff --git a/ReactAndroid/src/main/third-party/java/junit/BUCK b/ReactAndroid/src/main/third-party/java/junit/BUCK index f1f640886..9f4cbec62 100644 --- a/ReactAndroid/src/main/third-party/java/junit/BUCK +++ b/ReactAndroid/src/main/third-party/java/junit/BUCK @@ -1,5 +1,5 @@ -load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar") load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") +load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar") rn_android_library( name = "junit", diff --git a/ReactAndroid/src/main/third-party/java/mockito/BUCK b/ReactAndroid/src/main/third-party/java/mockito/BUCK index c79e46568..a7f916092 100644 --- a/ReactAndroid/src/main/third-party/java/mockito/BUCK +++ b/ReactAndroid/src/main/third-party/java/mockito/BUCK @@ -1,5 +1,5 @@ -load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar") load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") +load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar") rn_android_library( name = "mockito", diff --git a/ReactAndroid/src/main/third-party/java/okhttp/BUCK b/ReactAndroid/src/main/third-party/java/okhttp/BUCK index 252f671cd..5e78f47b6 100644 --- a/ReactAndroid/src/main/third-party/java/okhttp/BUCK +++ b/ReactAndroid/src/main/third-party/java/okhttp/BUCK @@ -1,5 +1,5 @@ -load("//tools/build_defs/oss:rn_defs.bzl", "rn_prebuilt_jar") load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") +load("//tools/build_defs/oss:rn_defs.bzl", "rn_prebuilt_jar") rn_prebuilt_jar( name = "okhttp3", diff --git a/ReactAndroid/src/main/third-party/java/okio/BUCK b/ReactAndroid/src/main/third-party/java/okio/BUCK index 3244f2b7a..02132feee 100644 --- a/ReactAndroid/src/main/third-party/java/okio/BUCK +++ b/ReactAndroid/src/main/third-party/java/okio/BUCK @@ -1,5 +1,5 @@ -load("//tools/build_defs/oss:rn_defs.bzl", "rn_prebuilt_jar") load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") +load("//tools/build_defs/oss:rn_defs.bzl", "rn_prebuilt_jar") rn_prebuilt_jar( name = "okio", diff --git a/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK b/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK index 4044bcb0a..a24c0db48 100644 --- a/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK +++ b/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK @@ -1,5 +1,5 @@ -load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library", "rn_prebuilt_jar") load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") +load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library", "rn_prebuilt_jar") rn_android_library( name = "robolectric", diff --git a/ReactAndroid/src/main/third-party/java/sqlite/BUCK b/ReactAndroid/src/main/third-party/java/sqlite/BUCK index eece8f9c4..7fd47e8a1 100644 --- a/ReactAndroid/src/main/third-party/java/sqlite/BUCK +++ b/ReactAndroid/src/main/third-party/java/sqlite/BUCK @@ -1,5 +1,5 @@ -load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar") load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") +load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar") rn_android_library( name = "sqlite", 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 0be6f52ed..302ae4024 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,5 @@ -load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_prebuilt_aar") load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") +load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_prebuilt_aar") rn_android_prebuilt_aar( name = "runner", diff --git a/ReactCommon/config/BUCK b/ReactCommon/config/BUCK index 8c295b3e3..97c6090b1 100644 --- a/ReactCommon/config/BUCK +++ b/ReactCommon/config/BUCK @@ -1,7 +1,7 @@ -load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "flags", "get_debug_preprocessor_flags", "get_static_library_ios_flags") -load("@fbsource//tools/build_defs/oss:rn_defs.bzl", "get_apple_inspector_flags", "rn_xplat_cxx_library") load("@fbsource//tools/build_defs:default_platform_defs.bzl", "ANDROID", "APPLE") load("@fbsource//tools/build_defs:glob_defs.bzl", "subdir_glob") +load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "flags", "get_debug_preprocessor_flags", "get_static_library_ios_flags") +load("@fbsource//tools/build_defs/oss:rn_defs.bzl", "get_apple_inspector_flags", "rn_xplat_cxx_library") APPLE_COMPILER_FLAGS = flags.get_flag_value( get_static_library_ios_flags(), diff --git a/codegen/BUCK b/codegen/BUCK index 49e7938c7..b9857c22d 100644 --- a/codegen/BUCK +++ b/codegen/BUCK @@ -1,7 +1,7 @@ -load("@fbsource//tools/build_defs/oss:rn_defs.bzl", "rn_xplat_cxx_library") load("@fbsource//tools/build_defs:default_platform_defs.bzl", "ANDROID", "APPLE") load("@fbsource//tools/build_defs:fb_native_wrapper.bzl", "fb_native") load("@fbsource//tools/build_defs:fb_xplat_cxx_binary.bzl", "fb_xplat_cxx_binary") +load("@fbsource//tools/build_defs/oss:rn_defs.bzl", "rn_xplat_cxx_library") load("@fbsource//xplat/js/react-native-github/codegen:DEFS.bzl", "rn_codegen_test") fb_native.sh_binary(