Remove --no-locals -> --release translation

am: c5de1b6cb2

Change-Id: I05bdbbee3fa9e18fbc376583f4bb9f68f46acf15
This commit is contained in:
Colin Cross 2017-12-22 03:29:27 +00:00 committed by android-build-merger
commit 4d9b7af491

View file

@ -942,20 +942,12 @@ func (j *Module) compileDexFullD8(ctx android.ModuleContext, flags javaBuilderFl
// to D8 flags. See: b/69377755 // to D8 flags. See: b/69377755
var dxFlags []string var dxFlags []string
for _, x := range j.deviceProperties.Dxflags { for _, x := range j.deviceProperties.Dxflags {
if x == "--core-library" { switch x {
case "--core-library", "--dex", "--multi-dex":
continue continue
default:
dxFlags = append(dxFlags, x)
} }
if x == "--dex" {
continue
}
if x == "--multi-dex" {
continue
}
if x == "--no-locals" {
dxFlags = append(dxFlags, "--release")
continue
}
dxFlags = append(dxFlags, x)
} }
if ctx.AConfig().Getenv("NO_OPTIMIZE_DX") != "" { if ctx.AConfig().Getenv("NO_OPTIMIZE_DX") != "" {