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

Merge "Declare proguard_dictionary as implicit output of r8"

Browse Source 
am: 8265a8b81f

Change-Id: I201e616913985f5924c67056760a1cc29207551b
This commit is contained in:
Colin Cross
2018-05-16 22:33:06 -07:00
committed by android-build-merger
parent 98032a65ac 8265a8b81f
commit 7d778cb4fd
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/dex.go
View File

@@ -238,14 +238,16 @@ func (j *Module) compileDex(ctx android.ModuleContext, flags javaBuilderFlags,
if useR8 { if useR8 {
// TODO(ccross): if this is an instrumentation test of an obfuscated app, use the // TODO(ccross): if this is an instrumentation test of an obfuscated app, use the
// dictionary of the app and move the app from libraryjars to injars. // dictionary of the app and move the app from libraryjars to injars.
j.proguardDictionary = android.PathForModuleOut(ctx, "proguard_dictionary") proguardDictionary := android.PathForModuleOut(ctx, "proguard_dictionary")
j.proguardDictionary = proguardDictionary
r8Flags, r8Deps := j.r8Flags(ctx, flags) r8Flags, r8Deps := j.r8Flags(ctx, flags)
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: r8, Rule: r8,
Description: "r8", Description: "r8",
Output: javalibJar, Output: javalibJar,
Input: classesJar, ImplicitOutput: proguardDictionary,
Implicits: r8Deps, Input: classesJar,
Implicits: r8Deps,
Args: map[string]string{ Args: map[string]string{
"dxFlags": strings.Join(dxFlags, " "), "dxFlags": strings.Join(dxFlags, " "),
"r8Flags": strings.Join(r8Flags, " "), "r8Flags": strings.Join(r8Flags, " "),