From 7f87f4fdeb30f612d74001acb26c466cbb452467 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 24 Apr 2019 13:41:45 -0700
Subject: [PATCH] Support target.hostdex.required

Hostdex modules sometimes need extra required modules, add
target.hostdex.required.

Bug: 131167818
Test: manual
Change-Id: I599f3499f0b738556baeb27185371a42b4c2701b
---
 java/androidmk.go | 3 +++
 java/java.go      | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/java/androidmk.go b/java/androidmk.go
index 304b1c42d..c2c24e2d8 100644
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -47,6 +47,9 @@ func (library *Library) AndroidMkHostDex(w io.Writer, name string, data android.
 		if len(data.Target_required) > 0 {
 			fmt.Fprintln(w, "LOCAL_TARGET_REQUIRED_MODULES :=", strings.Join(data.Target_required, " "))
 		}
+		if r := library.deviceProperties.Target.Hostdex.Required; len(r) > 0 {
+			fmt.Fprintln(w, "LOCAL_REQUIRED_MODULES +=", strings.Join(r, " "))
+		}
 		fmt.Fprintln(w, "include $(BUILD_SYSTEM)/soong_java_prebuilt.mk")
 	}
 }
diff --git a/java/java.go b/java/java.go
index d6c759b45..be0f4d2a5 100644
--- a/java/java.go
+++ b/java/java.go
@@ -221,6 +221,13 @@ type CompilerDeviceProperties struct {
 	// If true, export a copy of the module as a -hostdex module for host testing.
 	Hostdex *bool
 
+	Target struct {
+		Hostdex struct {
+			// Additional required dependencies to add to -hostdex modules.
+			Required []string
+		}
+	}
+
 	// If set to true, compile dex regardless of installable.  Defaults to false.
 	Compile_dex *bool