summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2017-12-21 13:01:34 -0800
committer Colin Cross <ccross@android.com> 2017-12-21 13:01:49 -0800
commitc5de1b6cb2e5b111ba725aa79beeff6b5d4493f4 (patch)
tree2b33effa880a920c8ee490dfaedf986dfa45a0c4 /java/java.go
parentcd406fa70b5e7164bca6541af0ecdab4d616b9e9 (diff)
Remove --no-locals -> --release translation
--no-locals is never used any more, remove the translation. Bug: 70886092 Test: m checkbuild Change-Id: Ie89aaad618c12c288d7e7bca863834cf7ee824fb
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go16
1 files changed, 4 insertions, 12 deletions
diff --git a/java/java.go b/java/java.go
index e6ed931fe..302bf78a5 100644
--- a/java/java.go
+++ b/java/java.go
@@ -942,20 +942,12 @@ func (j *Module) compileDexFullD8(ctx android.ModuleContext, flags javaBuilderFl
// to D8 flags. See: b/69377755
var dxFlags []string
for _, x := range j.deviceProperties.Dxflags {
- if x == "--core-library" {
- continue
- }
- if x == "--dex" {
- continue
- }
- if x == "--multi-dex" {
- continue
- }
- if x == "--no-locals" {
- dxFlags = append(dxFlags, "--release")
+ switch x {
+ case "--core-library", "--dex", "--multi-dex":
continue
+ default:
+ dxFlags = append(dxFlags, x)
}
- dxFlags = append(dxFlags, x)
}
if ctx.AConfig().Getenv("NO_OPTIMIZE_DX") != "" {