From ccf9672f6493add8274e800e814c0f85c9c04d3b Mon Sep 17 00:00:00 2001 From: Sundong Ahn Date: Mon, 17 Sep 2018 15:23:14 +0900 Subject: [PATCH] Add the metalava_enabled property The new property is added for supporting metalava. But some sdk library cannot use metalava. So "metalava_enabled: false" is added to these modules. Test: make -j Test: checkapi Bug: 117127012 Merged-In: Ib65f3cd73dac0ac6ed64afeca6546d99739e4424 Change-Id: Ib65f3cd73dac0ac6ed64afeca6546d99739e4424 (cherry picked from commit 558e702be0eb2de76bb45303c99322561d73216c) --- location/lib/Android.bp | 1 + media/lib/signer/Android.bp | 1 + test-base/Android.bp | 3 ++- test-mock/Android.bp | 1 + test-runner/Android.bp | 3 ++- 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/location/lib/Android.bp b/location/lib/Android.bp index 447195d6d5321..b09335c6707f9 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 3b25787540874..8c43683c2eeca 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 0b8a02a815d90..4d765d3e5f3f2 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 5eba01779f46b..37158e5fe0b98 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 ea615b920df63..0a0d50cc330cd 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 }