From 816a23a50d3dc4ef600583fb58854c3d1b293d09 Mon Sep 17 00:00:00 2001 From: Jeongik Cha Date: Wed, 8 Jul 2020 01:09:23 +0900 Subject: Introduce AlwaysUsePrebuiltSdks Instead of UnbundledBuild, use AlwaysUsePrebuiltSdks to determine if java modules needs to be built against prebuilt sdks. And rename UnbundledBuildUsePrebuiltSdks to AlwaysUsePrebuiltSdks to express its behavior more correctly.(It can be orthgonal to "Unbundled") Bug: 160390776 Test: TARGET_BUILD_UNBUNDLED_IMAGE=true m vendorimage Change-Id: I0be7265c1959d8774c295372cd7a9250169f6df9 --- java/hiddenapi_singleton.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/hiddenapi_singleton.go') diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go index 7afba2a79..0a330ebad 100644 --- a/java/hiddenapi_singleton.go +++ b/java/hiddenapi_singleton.go @@ -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") } -- cgit v1.2.3-59-g8ed1b