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
diff --git a/build/boot/Android.bp b/build/boot/Android.bp
index d549d84..16b6d95 100644
--- a/build/boot/Android.bp
+++ b/build/boot/Android.bp
@@ -43,8 +43,8 @@
},
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 f91e862..33a98ff 100644
--- a/build/sdk/Android.bp
+++ b/build/sdk/Android.bp
@@ -122,9 +122,8 @@
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",