From c5de1b6cb2e5b111ba725aa79beeff6b5d4493f4 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 21 Dec 2017 13:01:34 -0800
Subject: [PATCH] Remove --no-locals -> --release translation

--no-locals is never used any more, remove the translation.

Bug: 70886092
Test: m checkbuild
Change-Id: Ie89aaad618c12c288d7e7bca863834cf7ee824fb
---
 java/java.go | 16 ++++------------
 1 file 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" {
+		switch x {
+		case "--core-library", "--dex", "--multi-dex":
 			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") != "" {