commit 97466ef51600ed6c3090073bbd3964134a2eaa83
author Sundong Ahn <sundongahn@google.com> Thu Jan 10 22:38:58 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Jan 10 22:38:58 2019 -0800
tree 4d691a9b7efa17e01422f69dd95e5cc53174902c
parent 8ecc6c9e32e2fee5331ed0744447f12e498fe652
parent 806939b1b1cd3ae8c7dd3ccb320255cc986e8f07

Merge "Switch to metalava"
am: 806939b1b1

Change-Id: I3d9ea8c39dfcdaec12981a5ea3ca7fdd4d4e9118

location/lib/Android.bp

diff --git a/location/lib/Android.bp b/location/lib/Android.bp
index b09335c..35f2877 100644
--- a/location/lib/Android.bp
+++ b/location/lib/Android.bp
@@ -18,5 +18,7 @@
     name: "com.android.location.provider",
     srcs: ["java/**/*.java"],
     api_packages: ["com.android.location.provider"],
-    metalava_enabled: false,
+    srcs_lib: "framework",
+    srcs_lib_whitelist_dirs: ["location/java"],
+    srcs_lib_whitelist_pkgs: ["com.android.internal.location"],
 }

media/lib/signer/Android.bp

diff --git a/media/lib/signer/Android.bp b/media/lib/signer/Android.bp
index 8c43683..44f8725 100644
--- a/media/lib/signer/Android.bp
+++ b/media/lib/signer/Android.bp
@@ -18,5 +18,7 @@
     name: "com.android.mediadrm.signer",
     srcs: ["java/**/*.java"],
     api_packages: ["com.android.mediadrm.signer"],
-    metalava_enabled: false,
+    srcs_lib: "framework",
+    srcs_lib_whitelist_dirs: ["media/java"],
+    srcs_lib_whitelist_pkgs: ["android.media"],
 }

test-mock/Android.bp

diff --git a/test-mock/Android.bp b/test-mock/Android.bp
index 37158e5..e1d6e01 100644
--- a/test-mock/Android.bp
+++ b/test-mock/Android.bp
@@ -25,7 +25,8 @@
         "android.test.mock",
     ],
 
+    srcs_lib: "framework",
+    srcs_lib_whitelist_dirs: ["core/java"],
     srcs_lib_whitelist_pkgs: ["android"],
-    metalava_enabled: false,
     compile_dex: true,
 }