summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Chang <vichang@google.com>2021-06-30 21:43:13 +0100
committerAnton Hansson <hansson@google.com>2021-07-02 19:12:38 +0000
commit565e8ecd3081b49b811a6e18f94fcc94a7b94eaf (patch)
tree64e1cb0aa79e64d671894d01ff67a4b9b4f5a10a
parent50f3251a165e2a72df60dcedfd2b1c520b3a240c (diff)
Replace ART's core-platform-api stub with module-lib stubs
The stub should be identical now, and thus replacing it should cause no behavior change. It will help later remove the @CorePlatformApi usage in the java sources. Bug: 192645954 Bug: 192446466 Test: m droid Merged-In: I22538a0f65669885852a2cf1994c6d3a5561e52f Change-Id: I22538a0f65669885852a2cf1994c6d3a5561e52f
-rw-r--r--build/boot/Android.bp4
-rw-r--r--build/sdk/Android.bp3
2 files changed, 3 insertions, 4 deletions
diff --git a/build/boot/Android.bp b/build/boot/Android.bp
index d549d84a52..16b6d95f22 100644
--- a/build/boot/Android.bp
+++ b/build/boot/Android.bp
@@ -43,8 +43,8 @@ bootclasspath_fragment {
},
core_platform_api: {
stub_libs: [
- // Core platform stubs for all the non-coverage contents.
- "legacy.art.module.platform.api",
+ // Core platform (aka. module_lib) stubs for all the non-coverage contents.
+ "art.module.public.api.stubs.module_lib",
],
},
diff --git a/build/sdk/Android.bp b/build/sdk/Android.bp
index f91e862741..33a98ff8e2 100644
--- a/build/sdk/Android.bp
+++ b/build/sdk/Android.bp
@@ -122,9 +122,8 @@ art_module_sdk {
java_system_modules: [
"art-module-public-api-stubs-system-modules",
+ "art-module-lib-api-stubs-system-modules",
"art-module-intra-core-api-stubs-system-modules",
- "legacy-art-module-platform-api-stubs-system-modules",
- "stable-art-module-platform-api-stubs-system-modules",
"core-current-stubs-system-modules",
"core-module-lib-stubs-system-modules",
"legacy-core-platform-api-stubs-system-modules",