Merge "Remove sdk extensions from module_lib / system_server api databases" am: f7c8ab4a92 am: 445fe0aa42
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2439212 Change-Id: Iee69ef33bcb171a18af38811698c8d7751962abf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -546,7 +546,8 @@ droidstubs {
|
|||||||
"api-versions-jars-dir",
|
"api-versions-jars-dir",
|
||||||
],
|
],
|
||||||
api_levels_sdk_type: "module-lib",
|
api_levels_sdk_type: "module-lib",
|
||||||
extensions_info_file: ":sdk-extensions-info",
|
// extensions_info_file is purposefully omitted, because this module should just be
|
||||||
|
// the non-updatable portions of the sdk, and extension sdks are updatable.
|
||||||
}
|
}
|
||||||
|
|
||||||
droidstubs {
|
droidstubs {
|
||||||
@@ -563,7 +564,8 @@ droidstubs {
|
|||||||
"api-versions-jars-dir",
|
"api-versions-jars-dir",
|
||||||
],
|
],
|
||||||
api_levels_sdk_type: "system-server",
|
api_levels_sdk_type: "system-server",
|
||||||
extensions_info_file: ":sdk-extensions-info",
|
// extensions_info_file is purposefully omitted, because this module should just be
|
||||||
|
// the non-updatable portions of the sdk, and extension sdks are updatable.
|
||||||
}
|
}
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////
|
||||||
|
|||||||
Reference in New Issue
Block a user