Reformat xplat build files according to new formatting rules.

Summary: drop-conflicts

Reviewed By: zertosh

Differential Revision: D13610808

fbshipit-source-id: 52c2a90bba3d9b0ac383f6e4a76b4fb3e60bf382
This commit is contained in:
Taras Tsugrii 2019-01-10 19:57:40 -08:00 committed by Facebook Github Bot
parent 768c1ba641
commit c458242d87
21 changed files with 22 additions and 23 deletions

View File

@ -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",

View File

@ -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",

View File

@ -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",

View File

@ -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",

View File

@ -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",

View File

@ -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",

View File

@ -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

View File

@ -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",

View File

@ -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(

View File

@ -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",

View File

@ -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",

View File

@ -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",

View File

@ -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",

View File

@ -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",

View File

@ -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",

View File

@ -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",

View File

@ -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",

View File

@ -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",

View File

@ -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",

View File

@ -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(),

View File

@ -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(