StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove hidden API special handling of android.test.base"

Browse Source
This commit is contained in:
Paul Duffin
2021-04-07 12:27:16 +00:00
committed by Gerrit Code Review
parent 1be2290fdd b5933f64e4
commit 4896da1444
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/hiddenapi_singleton.go
View File

@@ -186,17 +186,6 @@ func stubFlagsRule(ctx android.SingletonContext) {
// We do not have prebuilts of the core platform api yet // We do not have prebuilts of the core platform api yet
corePlatformStubModules = append(corePlatformStubModules, "legacy.core.platform.api.stubs") 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. // Allow products to define their own stubs for custom product jars that apps can use.
publicStubModules = append(publicStubModules, ctx.Config().ProductHiddenAPIStubs()...) publicStubModules = append(publicStubModules, ctx.Config().ProductHiddenAPIStubs()...)
systemStubModules = append(systemStubModules, ctx.Config().ProductHiddenAPIStubsSystem()...) systemStubModules = append(systemStubModules, ctx.Config().ProductHiddenAPIStubsSystem()...)