Remove --no-locals -> --release translation am: c5de1b6cb2
am: 4d9b7af491
Change-Id: I2e9886d7a42624b1e2e9e6175196a1161defe1be
This commit is contained in:
16
java/java.go
16
java/java.go
@@ -942,21 +942,13 @@ 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:
|
||||||
if x == "--dex" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if x == "--multi-dex" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if x == "--no-locals" {
|
|
||||||
dxFlags = append(dxFlags, "--release")
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
dxFlags = append(dxFlags, x)
|
dxFlags = append(dxFlags, x)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if ctx.AConfig().Getenv("NO_OPTIMIZE_DX") != "" {
|
if ctx.AConfig().Getenv("NO_OPTIMIZE_DX") != "" {
|
||||||
dxFlags = append(dxFlags, "--debug")
|
dxFlags = append(dxFlags, "--debug")
|
||||||
|
Reference in New Issue
Block a user