From 7563aabeb32e9c9580bb955e51a9f9498704b51f Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Fri, 23 Aug 2019 20:36:58 +0900 Subject: Remove duplicated sources that go into hiddenapi-mappins framework-srcs are already coming from metalava-api-stubs-default (via framework-minus-apex). We don't need to give framework-srcs again. Test: choosecombo into sdk_phone_arm7 Test: m out/soong/.intermediates/frameworks/base/hiddenapi-mappings/android_common/api-versions.xml out/soong/.intermediates/frameworks/base/hiddenapi-mappings/android_common/dex-mapping.txt out/soong/.intermediates/frameworks/base/hiddenapi-mappings/android_common/hiddenapi-mappings-stubs.srcjar out/soong/.intermediates/frameworks/base/hiddenapi-mappings/android_common/hiddenapi-mappings_annotations.zip is successful Exempt-From-Owner-Approval: Approved internally Merged-In: I9ea6e06e8bd388f3a495acb6ff5555c0ce2f75b2 (cherry picked from commit 68020f8f638ff11f8292d710c8f244a7ef7ca824) Change-Id: I9ea6e06e8bd388f3a495acb6ff5555c0ce2f75b2 --- Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Android.bp b/Android.bp index da785b8b2d77..1d5e858951ff 100644 --- a/Android.bp +++ b/Android.bp @@ -1177,7 +1177,7 @@ droidstubs { droidstubs { name: "hiddenapi-mappings", defaults: ["metalava-api-stubs-default"], - srcs: framework_srcs + [ + srcs: [ ":non_openjdk_java_files", ":openjdk_java_files", ":opt-telephony-common-srcs", -- cgit v1.2.3-59-g8ed1b