openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This reverts commit 7b8a567f44.

Bug: 137282010
Test: With the CL above this one, the unbundled mainline module build
does not fail.

Change-Id: I2f49fa7dbe1da92cb282a9bc14acd5830888ed17
This commit is contained in:
Jiyong Park 2019-07-15 15:29:23 +09:00
parent 50b81e532b
commit 09cb629c15
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/hiddenapi_singleton.go
View File

@ -64,7 +64,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) && !ctx.Config().UnbundledBuild() { if ctx.Config().FrameworksBaseDirExists(ctx) {
h.flags = flagsRule(ctx) h.flags = flagsRule(ctx)
h.metadata = metadataRule(ctx) h.metadata = metadataRule(ctx)
} else { } else {

2
java/java.go
View File

@ -1322,11 +1322,9 @@ 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 {