Remove hidden API special handling of android.test.base

The android.test.base module should never be on the bootclasspath.

Bug: 184331423
Test: m droid
Change-Id: Ibb963b4ce2d915d0205fb1b5a7ca9159a5c99b3f
This commit is contained in:
Paul Duffin 2021-04-02 10:45:58 +01:00
parent de21202bd2
commit b5933f64e4

View file

@ -186,17 +186,6 @@ func stubFlagsRule(ctx android.SingletonContext) {
// We do not have prebuilts of the core platform api yet
corePlatformStubModules = append(corePlatformStubModules, "legacy.core.platform.api.stubs")
// Add the android.test.base to the set of stubs only if the android.test.base module is on
// the boot jars list as the runtime will only enforce hiddenapi access against modules on
// that list.
if inList("android.test.base", ctx.Config().BootJars()) {
if ctx.Config().AlwaysUsePrebuiltSdks() {
publicStubModules = append(publicStubModules, "sdk_public_current_android.test.base")
} else {
publicStubModules = append(publicStubModules, "android.test.base.stubs")
}
}
// Allow products to define their own stubs for custom product jars that apps can use.
publicStubModules = append(publicStubModules, ctx.Config().ProductHiddenAPIStubs()...)
systemStubModules = append(systemStubModules, ctx.Config().ProductHiddenAPIStubsSystem()...)