From 7b8a567f44b3fdb30eac8211e8ed8e27fb162797 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 28 May 2019 14:06:17 -0700 Subject: Don't build hiddenapi flags or encode dex for unbundled builds Builds with TARGET_BUILD_APPS shouldn't build the hiddenapi flags or encode dex files even if frameworks/base exists. Bug: 133343287 Test: mainline modules build Change-Id: I0647451420fd09bb680808b35e1ad3b8f514ba46 Merged-In: I0647451420fd09bb680808b35e1ad3b8f514ba46 (cherry picked from commit 9c74a1ee855b1dcf4871a4cc40f317bd765ab7fd) --- java/hiddenapi_singleton.go | 2 +- java/java.go | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go index 9627dc64..b1ddab48 100644 --- a/java/hiddenapi_singleton.go +++ b/java/hiddenapi_singleton.go @@ -61,7 +61,7 @@ func (h *hiddenAPISingleton) GenerateBuildActions(ctx android.SingletonContext) stubFlagsRule(ctx) // These rules depend on files located in frameworks/base, skip them if running in a tree that doesn't have them. - if ctx.Config().FrameworksBaseDirExists(ctx) { + if ctx.Config().FrameworksBaseDirExists(ctx) && !ctx.Config().UnbundledBuild() { h.flags = flagsRule(ctx) h.metadata = metadataRule(ctx) } else { diff --git a/java/java.go b/java/java.go index bf738c4d..ff6bbacc 100644 --- a/java/java.go +++ b/java/java.go @@ -1270,9 +1270,11 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path return } - // Hidden API CSV generation and dex encoding - dexOutputFile = j.hiddenAPI.hiddenAPI(ctx, dexOutputFile, j.implementationJarFile, - j.deviceProperties.UncompressDex) + if !ctx.Config().UnbundledBuild() { + // Hidden API CSV generation and dex encoding + dexOutputFile = j.hiddenAPI.hiddenAPI(ctx, dexOutputFile, j.implementationJarFile, + j.deviceProperties.UncompressDex) + } // merge dex jar with resources if necessary if j.resourceJar != nil { -- cgit v1.2.3