commit 14942dbdf3d1ee69157d480f104b8b9b9a795102
author Elliott Hughes <enh@google.com> Wed Oct 09 08:52:14 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 09 08:52:14 2019 -0700
tree 6bfa65c9a4ca16346632ef79bce0bed018a3e3d1
parent 65e06b8d4ca4db7559ad8e137a01a515caacd6b0
parent fd3e9dab5e5c03ff0d1eb143cc44efeaa601f59f

Restrict visibility of ImageMagick. am: b9b2c6ca0a am: 6a7435d792
am: fd3e9dab5e

Change-Id: I125c91fbbd2ac5db4960dcdfb55e8d0212d3c183

Magick++/Android.bp

diff --git a/Magick++/Android.bp b/Magick++/Android.bp
index c813a87..0642099 100644
--- a/Magick++/Android.bp
+++ b/Magick++/Android.bp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-cc_defaults {
-    name: "Magick++_defaults",
+cc_library_static {
+    name: "Magick++",
 
     srcs: ["lib/*.cpp"],
 
@@ -29,17 +29,7 @@
     header_libs: ["Magick_headers"],
     export_header_lib_headers: ["Magick_headers"],
     export_include_dirs: ["lib"],
-}
-
-cc_library_static {
-    name: "Magick++_platform",
-    defaults: ["Magick++_defaults"],
-    stl: "libc++_static",
-}
-
-cc_library_static {
-    name: "Magick++",
-    defaults: ["Magick++_defaults"],
     sdk_version: "24",
     stl: "c++_static",
+    visibility: ["//vendor:__subpackages__"],
 }

MagickCore/Android.bp

diff --git a/MagickCore/Android.bp b/MagickCore/Android.bp
index d0dcf48..ee9a33b 100644
--- a/MagickCore/Android.bp
+++ b/MagickCore/Android.bp
@@ -32,4 +32,5 @@
 
     header_libs: ["Magick_headers"],
     export_header_lib_headers: ["Magick_headers"],
+    visibility: ["//vendor:__subpackages__"],
 }

MagickWand/Android.bp

diff --git a/MagickWand/Android.bp b/MagickWand/Android.bp
index 45d3533..205cf19 100644
--- a/MagickWand/Android.bp
+++ b/MagickWand/Android.bp
@@ -27,4 +27,5 @@
     ],
 
     header_libs: ["Magick_headers"],
+    visibility: ["//vendor:__subpackages__"],
 }

coders/Android.bp

diff --git a/coders/Android.bp b/coders/Android.bp
index 9df3e20..d273dc5 100644
--- a/coders/Android.bp
+++ b/coders/Android.bp
@@ -38,4 +38,5 @@
 
     header_libs: ["Magick_headers"],
     static_libs: ["libjpeg_static_ndk"],
+    visibility: ["//vendor:__subpackages__"],
 }

filters/Android.bp

diff --git a/filters/Android.bp b/filters/Android.bp
index 066f49a..af29fdc 100644
--- a/filters/Android.bp
+++ b/filters/Android.bp
@@ -26,4 +26,5 @@
     ],
 
     header_libs: ["Magick_headers"],
+    visibility: ["//vendor:__subpackages__"],
 }