summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sundong Ahn <sundongahn@google.com> 2018-10-11 18:06:17 -0700
committer android-build-merger <android-build-merger@google.com> 2018-10-11 18:06:17 -0700
commit83a2bc6a3b2a21cf43c31de29ac4ed95e57f66fc (patch)
tree12028ca7d4a2e1a606f2421f5979aa277da5c1fb
parent10211c1f68e5ba0dc9c897e911d80a2e7fb4c80e (diff)
parent69251fca466a1caeb57ef7fe993ff9dd0d23b536 (diff)
Merge "Add the metalava_enabled property"
am: 69251fca46 Change-Id: I5720ce833d0ffd0016dc8a77cb0f56b0d34a9c21
-rw-r--r--location/lib/Android.bp1
-rw-r--r--media/lib/signer/Android.bp1
-rw-r--r--test-base/Android.bp3
-rw-r--r--test-mock/Android.bp1
-rw-r--r--test-runner/Android.bp3
5 files changed, 7 insertions, 2 deletions
diff --git a/location/lib/Android.bp b/location/lib/Android.bp
index 447195d6d532..b09335c6707f 100644
--- a/location/lib/Android.bp
+++ b/location/lib/Android.bp
@@ -18,4 +18,5 @@ java_sdk_library {
name: "com.android.location.provider",
srcs: ["java/**/*.java"],
api_packages: ["com.android.location.provider"],
+ metalava_enabled: false,
}
diff --git a/media/lib/signer/Android.bp b/media/lib/signer/Android.bp
index 3b2578754087..8c43683c2eec 100644
--- a/media/lib/signer/Android.bp
+++ b/media/lib/signer/Android.bp
@@ -18,4 +18,5 @@ java_sdk_library {
name: "com.android.mediadrm.signer",
srcs: ["java/**/*.java"],
api_packages: ["com.android.mediadrm.signer"],
+ metalava_enabled: false,
}
diff --git a/test-base/Android.bp b/test-base/Android.bp
index 0b8a02a815d9..4d765d3e5f3f 100644
--- a/test-base/Android.bp
+++ b/test-base/Android.bp
@@ -37,7 +37,8 @@ java_sdk_library {
"junit.framework",
],
- droiddoc_options: ["stubsourceonly"],
+ droiddoc_options: ["-stubsourceonly"],
+ metalava_enabled: false,
compile_dex: true,
}
diff --git a/test-mock/Android.bp b/test-mock/Android.bp
index 5eba01779f46..37158e5fe0b9 100644
--- a/test-mock/Android.bp
+++ b/test-mock/Android.bp
@@ -26,5 +26,6 @@ java_sdk_library {
],
srcs_lib_whitelist_pkgs: ["android"],
+ metalava_enabled: false,
compile_dex: true,
}
diff --git a/test-runner/Android.bp b/test-runner/Android.bp
index ea615b920df6..0a0d50cc330c 100644
--- a/test-runner/Android.bp
+++ b/test-runner/Android.bp
@@ -40,7 +40,8 @@ java_sdk_library {
"junit.textui",
],
- droiddoc_options: ["stubsourceonly"],
+ droiddoc_options: ["-stubsourceonly"],
+ metalava_enabled: false,
compile_dex: true
}