commit c78860b91ae07eed92f86876e7a03132adea6fcd
author Orion Hodson <oth@google.com> Fri Oct 11 11:30:01 2019 +0100
committer Orion Hodson <oth@google.com> Mon Oct 14 07:49:45 2019 +0000
tree 820f338333010f4d6e4b543ffea47e9ff7d2dd3f
parent b9a8541380c2bdb9685e16d8d4b2ba034ddbf870

Remove temporary soong visibility workarounds

Removes temporary unrestricted visibility for libnativeloader and
libnativebridge.

Bug: 137364733
Test: m nothing
Change-Id: I32d871b639deddd664c42e9962f6826ab798862f

libnativebridge/Android.bp

diff --git a/libnativebridge/Android.bp b/libnativebridge/Android.bp
index c97845d..2dd92d1 100644
--- a/libnativebridge/Android.bp
+++ b/libnativebridge/Android.bp
@@ -21,8 +21,12 @@
 cc_library {
     name: "libnativebridge",
     defaults: ["libnativebridge-defaults"],
-    // TODO(oth): remove after moving under art/ (b/137364733)
-    visibility: ["//visibility:public"],
+    visibility: [
+        "//art:__subpackages__",
+        // TODO(b/133140750): Clean this up.
+        "//frameworks/base/cmds/app_process",
+        "//frameworks/base/native/webview/loader/libwebviewchromium_loader",
+    ],
 
     host_supported: true,
     srcs: ["native_bridge.cc"],
@@ -54,8 +58,12 @@
 cc_library {
     name: "libnativebridge_lazy",
     defaults: ["libnativebridge-defaults"],
-    // TODO(oth): remove after moving under art/ (b/137364733)
-    visibility: ["//visibility:public"],
+    visibility: [
+        "//art/libnativebridge/tests",
+        "//frameworks/base/core/jni",
+        "//frameworks/native/opengl/libs",
+        "//frameworks/native/vulkan/libvulkan",
+    ],
 
     host_supported: false,
     srcs: ["native_bridge_lazy.cc"],

libnativeloader/Android.bp

diff --git a/libnativeloader/Android.bp b/libnativeloader/Android.bp
index 4b9c27f..f73becc 100644
--- a/libnativeloader/Android.bp
+++ b/libnativeloader/Android.bp
@@ -16,8 +16,12 @@
 cc_library {
     name: "libnativeloader",
     defaults: ["libnativeloader-defaults"],
-    // TODO(oth): remove after moving under art/ (b/137364733)
-    visibility: ["//visibility:public"],
+    visibility: [
+        "//art:__subpackages__",
+        // TODO(b/133140750): Clean this up.
+        "//frameworks/base/cmds/app_process",
+        "//frameworks/base/native/webview/loader",
+    ],
     host_supported: true,
     srcs: [
         "native_loader.cpp",
@@ -54,8 +58,11 @@
 cc_library {
     name: "libnativeloader_lazy",
     defaults: ["libnativeloader-defaults"],
-    // TODO(oth): remove after moving under art/ (b/137364733)
-    visibility: ["//visibility:public"],
+    visibility: [
+        "//frameworks/base/core/jni",
+        "//frameworks/native/opengl/libs",
+        "//frameworks/native/vulkan/libvulkan",
+    ],
     host_supported: false,
     srcs: ["native_loader_lazy.cpp"],
     required: ["libnativeloader"],
@@ -63,8 +70,12 @@
 
 cc_library_headers {
     name: "libnativeloader-headers",
-    // TODO(oth): remove after moving under art/ (b/137364733)
-    visibility: ["//visibility:public"],
+    visibility: [
+        "//art/libnativeloader/test",
+        "//frameworks/av/media/libstagefright",
+        "//frameworks/native/libs/graphicsenv",
+        "//frameworks/native/vulkan/libvulkan",
+    ],
     host_supported: true,
     export_include_dirs: ["include"],
 }