From 6b21c7d2abb207b325fd4117d032a94b34ee2599 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Tue, 11 Feb 2020 09:16:01 +0900
Subject: Automatically set compile_dex:true and hostdex:true for APEX variants

... unless they are turned off explicitly.

Bug: 147221965
Test: m
Change-Id: I6b91d6409d9cf06ad09467c53d5d51a9c693256e
---
 java/java.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'java/java.go')

diff --git a/java/java.go b/java/java.go
index dd44d06aa..279d67424 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1475,6 +1475,16 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) {
 
 	j.implementationAndResourcesJar = implementationAndResourcesJar
 
+	// Enable dex compilation for the APEX variants, unless it is disabled explicitly
+	if android.DirectlyInAnyApex(ctx, ctx.ModuleName()) && !j.IsForPlatform() {
+		if j.deviceProperties.Compile_dex == nil {
+			j.deviceProperties.Compile_dex = proptools.BoolPtr(true)
+		}
+		if j.deviceProperties.Hostdex == nil {
+			j.deviceProperties.Hostdex = proptools.BoolPtr(true)
+		}
+	}
+
 	if ctx.Device() && j.hasCode(ctx) &&
 		(Bool(j.properties.Installable) || Bool(j.deviceProperties.Compile_dex)) {
 		// Dex compilation
-- 
cgit v1.2.3-59-g8ed1b