From 09cb629c1558e13f2654baaf458619435203f58a Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Mon, 15 Jul 2019 15:29:23 +0900
Subject: Revert "Don't build hiddenapi flags or encode dex for unbundled
 builds"

This reverts commit 7b8a567f44b3fdb30eac8211e8ed8e27fb162797.

Bug: 137282010
Test: With the CL above this one, the unbundled mainline module build
does not fail.

Change-Id: I2f49fa7dbe1da92cb282a9bc14acd5830888ed17
---
 java/java.go | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'java/java.go')

diff --git a/java/java.go b/java/java.go
index 7c84e766f..318a36b88 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1322,11 +1322,9 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) {
 			return
 		}
 
-		if !ctx.Config().UnbundledBuild() {
-			// Hidden API CSV generation and dex encoding
-			dexOutputFile = j.hiddenAPI.hiddenAPI(ctx, dexOutputFile, j.implementationJarFile,
-				j.deviceProperties.UncompressDex)
-		}
+		// Hidden API CSV generation and dex encoding
+		dexOutputFile = j.hiddenAPI.hiddenAPI(ctx, dexOutputFile, j.implementationJarFile,
+			j.deviceProperties.UncompressDex)
 
 		// merge dex jar with resources if necessary
 		if j.resourceJar != nil {
-- 
cgit v1.2.3-59-g8ed1b