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

Restore UNSAFE_DISABLE_HIDDENAPI_FLAGS functionality.

Browse Source 
It got broken with the move to hiddenapi to Soong.

Test: UNSAFE_DISABLE_HIDDENAPI_FLAGS=true m -j32
Change-Id: Id369bfae8e118907b1f12faa7e4207494904edda
This commit is contained in:
David Brazdil
2019-01-18 11:12:05 +00:00
parent 77542038eb
commit 9fc36a68d0
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/hiddenapi.go
View File

@@ -78,11 +78,6 @@ var hiddenAPIEncodeDexRule = pctx.AndroidStaticRule("hiddenAPIEncodeDex", bluepr
}, "flags", "tmpDir") }, "flags", "tmpDir")
func hiddenAPIEncodeDex(ctx android.ModuleContext, output android.WritablePath, dexInput android.WritablePath) { func hiddenAPIEncodeDex(ctx android.ModuleContext, output android.WritablePath, dexInput android.WritablePath) {
if ctx.Config().IsEnvTrue("UNSAFE_DISABLE_HIDDENAPI_FLAGS") {
output = dexInput
return
}
flags := &bootImagePath{ctx.Config().HiddenAPIFlags()} flags := &bootImagePath{ctx.Config().HiddenAPIFlags()}
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{

20
java/java.go
View File

@@ -1180,15 +1180,17 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
} }
// Hidden API CSV generation and dex encoding // Hidden API CSV generation and dex encoding
isBootJar := inList(ctx.ModuleName(), ctx.Config().BootJars()) if !ctx.Config().IsEnvTrue("UNSAFE_DISABLE_HIDDENAPI_FLAGS") {
if isBootJar || inList(ctx.ModuleName(), ctx.Config().HiddenAPIExtraAppUsageJars()) { isBootJar := inList(ctx.ModuleName(), ctx.Config().BootJars())
// Derive the greylist from classes jar. if isBootJar || inList(ctx.ModuleName(), ctx.Config().HiddenAPIExtraAppUsageJars()) {
hiddenAPIGenerateCSV(ctx, j.implementationJarFile) // Derive the greylist from classes jar.
} hiddenAPIGenerateCSV(ctx, j.implementationJarFile)
if isBootJar { }
hiddenAPIJar := android.PathForModuleOut(ctx, "hiddenapi", jarName) if isBootJar {
hiddenAPIEncodeDex(ctx, hiddenAPIJar, dexOutputFile) hiddenAPIJar := android.PathForModuleOut(ctx, "hiddenapi", jarName)
dexOutputFile = hiddenAPIJar hiddenAPIEncodeDex(ctx, hiddenAPIJar, dexOutputFile)
dexOutputFile = hiddenAPIJar
}
} }
// merge dex jar with resources if necessary // merge dex jar with resources if necessary