From 12fc2af30c4422a7a86f7c2aea7b75a9f64f156c Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 14 Jan 2019 12:35:45 -0800
Subject: [PATCH] Export dex jars from java binaries

Set LOCAL_SOONG_DEX_JAR and LOCAL_SOONG_BUILT_INSTALLED for
java binaries to install the jar with classes.dex and the
preopted files.

Bug: 122831369
Test: m deployagent
Change-Id: I6018aee25491e0c77a5f6dc464668d2bf6c317c0
---
 java/androidmk.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/java/androidmk.go b/java/androidmk.go
index 70d0f7f98..4d3af12f5 100644
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -157,6 +157,12 @@ func (binary *Binary) AndroidMk() android.AndroidMkData {
 				func(w io.Writer, outputFile android.Path) {
 					fmt.Fprintln(w, "LOCAL_SOONG_HEADER_JAR :=", binary.headerJarFile.String())
 					fmt.Fprintln(w, "LOCAL_SOONG_CLASSES_JAR :=", binary.implementationAndResourcesJar.String())
+					if binary.dexJarFile != nil {
+						fmt.Fprintln(w, "LOCAL_SOONG_DEX_JAR :=", binary.dexJarFile.String())
+					}
+					if len(binary.dexpreopter.builtInstalled) > 0 {
+						fmt.Fprintln(w, "LOCAL_SOONG_BUILT_INSTALLED :=", strings.Join(binary.dexpreopter.builtInstalled, " "))
+					}
 				},
 			},
 			Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) {