From 7030d9598803a3193fa4e49864447ea116b40ad2 Mon Sep 17 00:00:00 2001
From: Adam Ernst <adamjernst@fb.com>
Date: Tue, 27 Nov 2018 13:43:56 -0800
Subject: [PATCH] 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
---
 ReactAndroid/libs/BUCK                                      | 5 +++--
 .../src/main/libraries/fresco/fresco-react-native/BUCK      | 6 +++---
 .../src/main/third-party/android/support-annotations/BUCK   | 3 ++-
 .../main/third-party/android/support/v7/appcompat-orig/BUCK | 6 +++---
 .../src/main/third-party/java/infer-annotations/BUCK        | 3 ++-
 ReactAndroid/src/main/third-party/java/javapoet/BUCK        | 3 ++-
 ReactAndroid/src/main/third-party/java/okhttp/BUCK          | 5 +++--
 ReactAndroid/src/main/third-party/java/okio/BUCK            | 3 ++-
 .../src/main/third-party/java/testing-support-lib/BUCK      | 5 +++--
 tools/build_defs/oss/rn_defs.bzl                            | 3 +++
 10 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/ReactAndroid/libs/BUCK b/ReactAndroid/libs/BUCK
index d647c5f79d8dfe..d023869609a0b2 100644
--- a/ReactAndroid/libs/BUCK
+++ b/ReactAndroid/libs/BUCK
@@ -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/..."],
@@ -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",
 )
diff --git a/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK b/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK
index 0c7bb77f8ef5af..a927134101263c 100644
--- a/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK
+++ b/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK
@@ -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/..."],
@@ -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/..."],
@@ -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/..."],
diff --git a/ReactAndroid/src/main/third-party/android/support-annotations/BUCK b/ReactAndroid/src/main/third-party/android/support-annotations/BUCK
index 607d39477f0242..841b4692b4ff79 100644
--- a/ReactAndroid/src/main/third-party/android/support-annotations/BUCK
+++ b/ReactAndroid/src/main/third-party/android/support-annotations/BUCK
@@ -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/..."],
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 0edf1f8e78354c..ed227826eb9a21 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,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
@@ -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",
diff --git a/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK b/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK
index 481e44b8e07122..6e55893d576ad7 100644
--- a/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK
+++ b/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK
@@ -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/..."],
diff --git a/ReactAndroid/src/main/third-party/java/javapoet/BUCK b/ReactAndroid/src/main/third-party/java/javapoet/BUCK
index cf2a2c77fa7f70..5c20e06fcded26 100644
--- a/ReactAndroid/src/main/third-party/java/javapoet/BUCK
+++ b/ReactAndroid/src/main/third-party/java/javapoet/BUCK
@@ -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/..."],
diff --git a/ReactAndroid/src/main/third-party/java/okhttp/BUCK b/ReactAndroid/src/main/third-party/java/okhttp/BUCK
index de75ada168cc88..252f671cd7d2e6 100644
--- a/ReactAndroid/src/main/third-party/java/okhttp/BUCK
+++ b/ReactAndroid/src/main/third-party/java/okhttp/BUCK
@@ -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/..."],
@@ -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/..."],
diff --git a/ReactAndroid/src/main/third-party/java/okio/BUCK b/ReactAndroid/src/main/third-party/java/okio/BUCK
index 13a8e39757a4d9..3244f2b7abe3b7 100644
--- a/ReactAndroid/src/main/third-party/java/okio/BUCK
+++ b/ReactAndroid/src/main/third-party/java/okio/BUCK
@@ -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/..."],
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 9ef85775609c06..0be6f52ed671c3 100644
--- a/ReactAndroid/src/main/third-party/java/testing-support-lib/BUCK
+++ b/ReactAndroid/src/main/third-party/java/testing-support-lib/BUCK
@@ -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/..."],
@@ -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/..."],
diff --git a/tools/build_defs/oss/rn_defs.bzl b/tools/build_defs/oss/rn_defs.bzl
index fbf99d0cb90bce..359537c0102384 100644
--- a/tools/build_defs/oss/rn_defs.bzl
+++ b/tools/build_defs/oss/rn_defs.bzl
@@ -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 []