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: [PATCH] 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 -----
 java/java.go      | 20 +++++++++++---------
 2 files changed, 11 insertions(+), 14 deletions(-)

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{
diff --git a/java/java.go b/java/java.go
index 49095ca36..209d0a703 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1180,15 +1180,17 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
 		}
 
 		// Hidden API CSV generation and dex encoding
-		isBootJar := inList(ctx.ModuleName(), ctx.Config().BootJars())
-		if isBootJar || inList(ctx.ModuleName(), ctx.Config().HiddenAPIExtraAppUsageJars()) {
-			// Derive the greylist from classes jar.
-			hiddenAPIGenerateCSV(ctx, j.implementationJarFile)
-		}
-		if isBootJar {
-			hiddenAPIJar := android.PathForModuleOut(ctx, "hiddenapi", jarName)
-			hiddenAPIEncodeDex(ctx, hiddenAPIJar, dexOutputFile)
-			dexOutputFile = hiddenAPIJar
+		if !ctx.Config().IsEnvTrue("UNSAFE_DISABLE_HIDDENAPI_FLAGS") {
+			isBootJar := inList(ctx.ModuleName(), ctx.Config().BootJars())
+			if isBootJar || inList(ctx.ModuleName(), ctx.Config().HiddenAPIExtraAppUsageJars()) {
+				// Derive the greylist from classes jar.
+				hiddenAPIGenerateCSV(ctx, j.implementationJarFile)
+			}
+			if isBootJar {
+				hiddenAPIJar := android.PathForModuleOut(ctx, "hiddenapi", jarName)
+				hiddenAPIEncodeDex(ctx, hiddenAPIJar, dexOutputFile)
+				dexOutputFile = hiddenAPIJar
+			}
 		}
 
 		// merge dex jar with resources if necessary