From b5933f64e4e5fb1b5ab9c671f66184c2f62f572b Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 2 Apr 2021 10:45:58 +0100 Subject: [PATCH] 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 --- java/hiddenapi_singleton.go | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go index 6ad4ff322..0e9b6c528 100644 --- a/java/hiddenapi_singleton.go +++ b/java/hiddenapi_singleton.go @@ -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()...)