Skip to content

Commit

Permalink
Fix unmangled visibility in rn_defs
Browse files Browse the repository at this point in the history
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
  • Loading branch information
adamjernst authored and facebook-github-bot committed Nov 27, 2018
1 parent 706888d commit 7030d95
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 16 deletions.
5 changes: 3 additions & 2 deletions ReactAndroid/libs/BUCK
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_prebuilt_aar")
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")

fb_native.android_prebuilt_aar(
rn_android_prebuilt_aar(
name = "appcompat",
aar = ":appcompat-binary-aar",
visibility = ["//ReactAndroid/..."],
Expand All @@ -12,7 +13,7 @@ fb_native.remote_file(
url = "mvn:com.android.support:appcompat-v7:aar:27.1.1",
)

fb_native.android_prebuilt_aar(
rn_android_prebuilt_aar(
name = "android-jsc",
aar = ":android-jsc-aar",
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ fb_native.remote_file(
url = "mvn:com.facebook.fresco:fresco:aar:1.10.0",
)

fb_native.android_prebuilt_aar(
rn_android_prebuilt_aar(
name = "fresco-drawee",
aar = ":drawee-binary-aar",
visibility = ["//ReactAndroid/..."],
Expand Down Expand Up @@ -71,7 +71,7 @@ fb_native.remote_file(
url = "mvn:com.parse.bolts:bolts-tasks:jar:1.4.0",
)

fb_native.android_prebuilt_aar(
rn_android_prebuilt_aar(
name = "fbcore",
aar = ":fbcore-aar",
visibility = ["//ReactAndroid/..."],
Expand All @@ -83,7 +83,7 @@ fb_native.remote_file(
url = "mvn:com.facebook.fresco:fbcore:aar:1.10.0",
)

fb_native.android_prebuilt_aar(
rn_android_prebuilt_aar(
name = "imagepipeline-okhttp3",
aar = ":imagepipeline-okhttp3-binary-aar",
visibility = ["//ReactAndroid/..."],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
load("//tools/build_defs/oss:rn_defs.bzl", "rn_prebuilt_jar")
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")

fb_native.prebuilt_jar(
rn_prebuilt_jar(
name = "android-support-annotations",
binary_jar = ":support-annotations-binary.jar",
visibility = ["//ReactAndroid/..."],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library", "rn_android_resource", "rn_prebuilt_jar")
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")

# This is a bit messy and hopefully a temporary thing
Expand Down Expand Up @@ -38,13 +38,13 @@ rn_prebuilt_jar(
visibility = ["//ReactAndroid/..."],
)

fb_native.genrule(
rn_genrule(
name = "classes-unpacker-cmd",
out = "classes.jar",
cmd = "$(exe :aar-unpacker) $(location :appcompat-binary-aar) classes.jar $OUT",
)

fb_native.genrule(
rn_genrule(
name = "res-unpacker-cmd",
out = "res",
cmd = "$(exe :aar-unpacker) $(location :appcompat-binary-aar) res/ $OUT",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
load("//tools/build_defs/oss:rn_defs.bzl", "rn_prebuilt_jar")
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")

fb_native.prebuilt_jar(
rn_prebuilt_jar(
name = "infer-annotations",
binary_jar = ":infer-annotations.jar",
visibility = ["//ReactAndroid/..."],
Expand Down
3 changes: 2 additions & 1 deletion ReactAndroid/src/main/third-party/java/javapoet/BUCK
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
load("//tools/build_defs/oss:rn_defs.bzl", "rn_prebuilt_jar")
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")

fb_native.prebuilt_jar(
rn_prebuilt_jar(
name = "javapoet",
binary_jar = ":jsr305-binary.jar",
visibility = ["//ReactAndroid/..."],
Expand Down
5 changes: 3 additions & 2 deletions ReactAndroid/src/main/third-party/java/okhttp/BUCK
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
load("//tools/build_defs/oss:rn_defs.bzl", "rn_prebuilt_jar")
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")

fb_native.prebuilt_jar(
rn_prebuilt_jar(
name = "okhttp3",
binary_jar = ":okhttp3-binary.jar",
visibility = ["//ReactAndroid/..."],
Expand All @@ -12,7 +13,7 @@ fb_native.remote_file(
url = "mvn:com.squareup.okhttp3:okhttp:jar:3.11.0",
)

fb_native.prebuilt_jar(
rn_prebuilt_jar(
name = "okhttp3-urlconnection",
binary_jar = ":okhttp3-urlconnection-binary.jar",
visibility = ["//ReactAndroid/..."],
Expand Down
3 changes: 2 additions & 1 deletion ReactAndroid/src/main/third-party/java/okio/BUCK
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
load("//tools/build_defs/oss:rn_defs.bzl", "rn_prebuilt_jar")
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")

fb_native.prebuilt_jar(
rn_prebuilt_jar(
name = "okio",
binary_jar = ":okio-binary.jar",
visibility = ["//ReactAndroid/..."],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_prebuilt_aar")
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")

fb_native.android_prebuilt_aar(
rn_android_prebuilt_aar(
name = "runner",
aar = ":testing-support-lib-runner-download",
visibility = ["//ReactAndroid/..."],
Expand All @@ -12,7 +13,7 @@ fb_native.remote_file(
url = "mvn:com.android.support.test:runner:aar:0.3",
)

fb_native.android_prebuilt_aar(
rn_android_prebuilt_aar(
name = "exposed-instrumentation-api",
aar = ":testing-support-instrumentation",
visibility = ["//ReactAndroid/..."],
Expand Down
3 changes: 3 additions & 0 deletions tools/build_defs/oss/rn_defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,9 @@ def rn_prebuilt_native_library(*args, **kwargs):
def rn_prebuilt_jar(*args, **kwargs):
native.prebuilt_jar(*args, **kwargs)

def rn_genrule(*args, **kwargs):
native.genrule(*args, **kwargs)

def rn_robolectric_test(name, srcs, vm_args = None, *args, **kwargs):
vm_args = vm_args or []

Expand Down

0 comments on commit 7030d95

Please sign in to comment.