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

Don't build hiddenapi flags or encode dex for unbundled builds

Browse Source 
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
This commit is contained in:
Colin Cross
2019-05-28 14:06:17 -07:00
parent ff3f43857f
commit 9c74a1ee85
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/hiddenapi_singleton.go
View File

@@ -61,7 +61,7 @@ func (h *hiddenAPISingleton) GenerateBuildActions(ctx android.SingletonContext)
stubFlagsRule(ctx) stubFlagsRule(ctx)
// These rules depend on files located in frameworks/base, skip them if running in a tree that doesn't have them. // 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.flags = flagsRule(ctx)
h.metadata = metadataRule(ctx) h.metadata = metadataRule(ctx)
} else { } else {

2
java/java.go
View File

@@ -1301,9 +1301,11 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) {
return return
} }
if !ctx.Config().UnbundledBuild() {
// Hidden API CSV generation and dex encoding // Hidden API CSV generation and dex encoding
dexOutputFile = j.hiddenAPI.hiddenAPI(ctx, dexOutputFile, j.implementationJarFile, dexOutputFile = j.hiddenAPI.hiddenAPI(ctx, dexOutputFile, j.implementationJarFile,
j.deviceProperties.UncompressDex) j.deviceProperties.UncompressDex)
}
// merge dex jar with resources if necessary // merge dex jar with resources if necessary
if j.resourceJar != nil { if j.resourceJar != nil {