Merge "Introduce AlwaysUsePrebuiltSdks"

This commit is contained in:
Jeongik Cha
2020-08-10 00:51:56 +00:00
committed by Gerrit Code Review
12 changed files with 59 additions and 45 deletions

View File

@@ -100,7 +100,7 @@ func stubFlagsRule(ctx android.SingletonContext) {
// 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()) && !ctx.Config().UnbundledBuildUsePrebuiltSdks() {
if inList("android.test.base", ctx.Config().BootJars()) && !ctx.Config().AlwaysUsePrebuiltSdks() {
publicStubModules = append(publicStubModules, "android.test.base.stubs")
}