From 5484533fbab4b6c8ac13b1aab6f247475cd40536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= Date: Tue, 6 Sep 2022 15:50:37 +0200 Subject: [PATCH] Update droidstubs to use the SdkExt info file metalava now accepts the --sdk-extensions-info flag. The argument is a file containing metadata regarding extension SDKs; the SdkExtensions module defines such a file. Update the droidstub targets to point to this file. Bug: 228828986 Test: m sdk dist Change-Id: I3a5d92c640d9b22add416a20dbec3c8e352ba963 --- ApiDocs.bp | 2 ++ StubLibraries.bp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ApiDocs.bp b/ApiDocs.bp index e6525c9b8eaa..c87ecde4e5c8 100644 --- a/ApiDocs.bp +++ b/ApiDocs.bp @@ -132,6 +132,7 @@ droidstubs { "api-versions-jars-dir", ], api_levels_sdk_type: "system", + extensions_info_file: ":sdk-extensions-info", } droidstubs { @@ -146,6 +147,7 @@ droidstubs { "packages/modules/Media/apex/aidl/stable", ], }, + extensions_info_file: ":sdk-extensions-info", } ///////////////////////////////////////////////////////////////////// diff --git a/StubLibraries.bp b/StubLibraries.bp index 32101c791242..bc2e6dd79fea 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -420,6 +420,7 @@ droidstubs { "sdk-dir", "api-versions-jars-dir", ], + extensions_info_file: ":sdk-extensions-info", } droidstubs { @@ -432,6 +433,7 @@ droidstubs { "api-versions-jars-dir", ], api_levels_sdk_type: "system", + extensions_info_file: ":sdk-extensions-info", } /////////////////////////////////////////////////////////////////////