summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author MÃ¥rten Kongstad <amhk@google.com> 2022-09-08 08:10:40 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-08 08:10:40 +0000
commit2de043aa0cd2fa2043a79feb6a2fa174ade0c229 (patch)
tree5549301a906f5b6254bce679b2503377214a75a3
parenta2d879a9fdd63a2eb5f5113901d5ff432e455558 (diff)
parent8c513b58e4110ce2e551e7a532f475e102651b14 (diff)
Merge "Update droidstubs to use the SdkExt info file" am: 3312d073cb am: 74c2f2abd8 am: d7e5f37d5c am: d77db87a54 am: 8c513b58e4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2207622 Change-Id: I5c9d66fb004e1daefc27bc18fc3c570025535664 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--ApiDocs.bp2
-rw-r--r--StubLibraries.bp2
2 files changed, 4 insertions, 0 deletions
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",
}
/////////////////////////////////////////////////////////////////////