From 9fc36a68d0d0f260806b66e88bebefd778a5eb5c Mon Sep 17 00:00:00 2001
From: David Brazdil <dbrazdil@google.com>
Date: Fri, 18 Jan 2019 11:12:05 +0000
Subject: Restore UNSAFE_DISABLE_HIDDENAPI_FLAGS functionality.

It got broken with the move to hiddenapi to Soong.

Test: UNSAFE_DISABLE_HIDDENAPI_FLAGS=true m -j32
Change-Id: Id369bfae8e118907b1f12faa7e4207494904edda
---
 java/hiddenapi.go | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'java/hiddenapi.go')

diff --git a/java/hiddenapi.go b/java/hiddenapi.go
index 7378b6401..de72e7c79 100644
--- a/java/hiddenapi.go
+++ b/java/hiddenapi.go
@@ -78,11 +78,6 @@ var hiddenAPIEncodeDexRule = pctx.AndroidStaticRule("hiddenAPIEncodeDex", bluepr
 }, "flags", "tmpDir")
 
 func hiddenAPIEncodeDex(ctx android.ModuleContext, output android.WritablePath, dexInput android.WritablePath) {
-	if ctx.Config().IsEnvTrue("UNSAFE_DISABLE_HIDDENAPI_FLAGS") {
-		output = dexInput
-		return
-	}
-
 	flags := &bootImagePath{ctx.Config().HiddenAPIFlags()}
 
 	ctx.Build(pctx, android.BuildParams{
-- 
cgit v1.2.3-59-g8ed1b