tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't pass --legacy by default to aapt2 compile

Browse source 
Don't pass --legacy by default, it is rarely necessary and converts
some errors into warnings that crash at runtime.  The modules that
need it have had --legacy added to aaptflags.

Bug: 135597368
Test: m java
Change-Id: Ib05a07ead4084dd32ba28df26708d81bb53f2f2a
This commit is contained in:
Colin Cross 2019-06-20 16:53:30 -07:00
parent a0ba2f5858
commit 4215cfd8f9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
java/aapt2.go
View file

@ -55,7 +55,7 @@ func pathsToAapt2Paths(ctx android.ModuleContext, resPaths android.Paths) androi
var aapt2CompileRule = pctx.AndroidStaticRule("aapt2Compile", var aapt2CompileRule = pctx.AndroidStaticRule("aapt2Compile",
blueprint.RuleParams{ blueprint.RuleParams{
Command: `${config.Aapt2Cmd} compile -o $outDir $cFlags --legacy $in`, Command: `${config.Aapt2Cmd} compile -o $outDir $cFlags $in`,
CommandDeps: []string{"${config.Aapt2Cmd}"}, CommandDeps: []string{"${config.Aapt2Cmd}"},
}, },
"outDir", "cFlags") "outDir", "cFlags")
@ -97,7 +97,7 @@ func aapt2Compile(ctx android.ModuleContext, dir android.Path, paths android.Pat
var aapt2CompileZipRule = pctx.AndroidStaticRule("aapt2CompileZip", var aapt2CompileZipRule = pctx.AndroidStaticRule("aapt2CompileZip",
blueprint.RuleParams{ blueprint.RuleParams{
Command: `${config.ZipSyncCmd} -d $resZipDir $zipSyncFlags $in && ` + Command: `${config.ZipSyncCmd} -d $resZipDir $zipSyncFlags $in && ` +
`${config.Aapt2Cmd} compile -o $out $cFlags --legacy --dir $resZipDir`, `${config.Aapt2Cmd} compile -o $out $cFlags --dir $resZipDir`,
CommandDeps: []string{ CommandDeps: []string{
"${config.Aapt2Cmd}", "${config.Aapt2Cmd}",
"${config.ZipSyncCmd}", "${config.ZipSyncCmd}",