Skip to content

Commit 7030d95

Browse files
adamjernstfacebook-github-bot
authored andcommitted
Fix unmangled visibility in rn_defs
Summary: The wrappers exposed by `rn_defs.bzl` should mangle visibility to include the cell. Reviewed By: scottrice Differential Revision: D13219109 fbshipit-source-id: ded17e79a1d388d6b76fbdf2ab0d75e586092fcd
1 parent 706888d commit 7030d95

File tree

10 files changed

+26
-16
lines changed
  • ReactAndroid
    • libs
    • src/main
      • libraries/fresco/fresco-react-native
      • third-party
  • tools/build_defs/oss

10 files changed

+26
-16
lines changed

Diff for: ReactAndroid/libs/BUCK

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_prebuilt_aar")
12
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
23

3-
fb_native.android_prebuilt_aar(
4+
rn_android_prebuilt_aar(
45
name = "appcompat",
56
aar = ":appcompat-binary-aar",
67
visibility = ["//ReactAndroid/..."],
@@ -12,7 +13,7 @@ fb_native.remote_file(
1213
url = "mvn:com.android.support:appcompat-v7:aar:27.1.1",
1314
)
1415

15-
fb_native.android_prebuilt_aar(
16+
rn_android_prebuilt_aar(
1617
name = "android-jsc",
1718
aar = ":android-jsc-aar",
1819
)

Diff for: ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fb_native.remote_file(
1313
url = "mvn:com.facebook.fresco:fresco:aar:1.10.0",
1414
)
1515

16-
fb_native.android_prebuilt_aar(
16+
rn_android_prebuilt_aar(
1717
name = "fresco-drawee",
1818
aar = ":drawee-binary-aar",
1919
visibility = ["//ReactAndroid/..."],
@@ -71,7 +71,7 @@ fb_native.remote_file(
7171
url = "mvn:com.parse.bolts:bolts-tasks:jar:1.4.0",
7272
)
7373

74-
fb_native.android_prebuilt_aar(
74+
rn_android_prebuilt_aar(
7575
name = "fbcore",
7676
aar = ":fbcore-aar",
7777
visibility = ["//ReactAndroid/..."],
@@ -83,7 +83,7 @@ fb_native.remote_file(
8383
url = "mvn:com.facebook.fresco:fbcore:aar:1.10.0",
8484
)
8585

86-
fb_native.android_prebuilt_aar(
86+
rn_android_prebuilt_aar(
8787
name = "imagepipeline-okhttp3",
8888
aar = ":imagepipeline-okhttp3-binary-aar",
8989
visibility = ["//ReactAndroid/..."],

Diff for: ReactAndroid/src/main/third-party/android/support-annotations/BUCK

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
load("//tools/build_defs/oss:rn_defs.bzl", "rn_prebuilt_jar")
12
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
23

3-
fb_native.prebuilt_jar(
4+
rn_prebuilt_jar(
45
name = "android-support-annotations",
56
binary_jar = ":support-annotations-binary.jar",
67
visibility = ["//ReactAndroid/..."],

Diff for: ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library", "rn_android_resource", "rn_prebuilt_jar")
1+
load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library", "rn_android_resource", "rn_genrule", "rn_prebuilt_jar")
22
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
33

44
# This is a bit messy and hopefully a temporary thing
@@ -38,13 +38,13 @@ rn_prebuilt_jar(
3838
visibility = ["//ReactAndroid/..."],
3939
)
4040

41-
fb_native.genrule(
41+
rn_genrule(
4242
name = "classes-unpacker-cmd",
4343
out = "classes.jar",
4444
cmd = "$(exe :aar-unpacker) $(location :appcompat-binary-aar) classes.jar $OUT",
4545
)
4646

47-
fb_native.genrule(
47+
rn_genrule(
4848
name = "res-unpacker-cmd",
4949
out = "res",
5050
cmd = "$(exe :aar-unpacker) $(location :appcompat-binary-aar) res/ $OUT",

Diff for: ReactAndroid/src/main/third-party/java/infer-annotations/BUCK

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
load("//tools/build_defs/oss:rn_defs.bzl", "rn_prebuilt_jar")
12
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
23

3-
fb_native.prebuilt_jar(
4+
rn_prebuilt_jar(
45
name = "infer-annotations",
56
binary_jar = ":infer-annotations.jar",
67
visibility = ["//ReactAndroid/..."],

Diff for: ReactAndroid/src/main/third-party/java/javapoet/BUCK

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
load("//tools/build_defs/oss:rn_defs.bzl", "rn_prebuilt_jar")
12
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
23

3-
fb_native.prebuilt_jar(
4+
rn_prebuilt_jar(
45
name = "javapoet",
56
binary_jar = ":jsr305-binary.jar",
67
visibility = ["//ReactAndroid/..."],

Diff for: ReactAndroid/src/main/third-party/java/okhttp/BUCK

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
load("//tools/build_defs/oss:rn_defs.bzl", "rn_prebuilt_jar")
12
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
23

3-
fb_native.prebuilt_jar(
4+
rn_prebuilt_jar(
45
name = "okhttp3",
56
binary_jar = ":okhttp3-binary.jar",
67
visibility = ["//ReactAndroid/..."],
@@ -12,7 +13,7 @@ fb_native.remote_file(
1213
url = "mvn:com.squareup.okhttp3:okhttp:jar:3.11.0",
1314
)
1415

15-
fb_native.prebuilt_jar(
16+
rn_prebuilt_jar(
1617
name = "okhttp3-urlconnection",
1718
binary_jar = ":okhttp3-urlconnection-binary.jar",
1819
visibility = ["//ReactAndroid/..."],

Diff for: ReactAndroid/src/main/third-party/java/okio/BUCK

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
load("//tools/build_defs/oss:rn_defs.bzl", "rn_prebuilt_jar")
12
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
23

3-
fb_native.prebuilt_jar(
4+
rn_prebuilt_jar(
45
name = "okio",
56
binary_jar = ":okio-binary.jar",
67
visibility = ["//ReactAndroid/..."],

Diff for: ReactAndroid/src/main/third-party/java/testing-support-lib/BUCK

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_prebuilt_aar")
12
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
23

3-
fb_native.android_prebuilt_aar(
4+
rn_android_prebuilt_aar(
45
name = "runner",
56
aar = ":testing-support-lib-runner-download",
67
visibility = ["//ReactAndroid/..."],
@@ -12,7 +13,7 @@ fb_native.remote_file(
1213
url = "mvn:com.android.support.test:runner:aar:0.3",
1314
)
1415

15-
fb_native.android_prebuilt_aar(
16+
rn_android_prebuilt_aar(
1617
name = "exposed-instrumentation-api",
1718
aar = ":testing-support-instrumentation",
1819
visibility = ["//ReactAndroid/..."],

Diff for: tools/build_defs/oss/rn_defs.bzl

+3
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,9 @@ def rn_prebuilt_native_library(*args, **kwargs):
145145
def rn_prebuilt_jar(*args, **kwargs):
146146
native.prebuilt_jar(*args, **kwargs)
147147

148+
def rn_genrule(*args, **kwargs):
149+
native.genrule(*args, **kwargs)
150+
148151
def rn_robolectric_test(name, srcs, vm_args = None, *args, **kwargs):
149152
vm_args = vm_args or []
150153

0 commit comments

Comments
 (0)