From 5dfabfba3e13a7349a6a87bd201c5e45a8754edc Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 14 Dec 2017 13:19:01 -0800 Subject: [PATCH] Export app implementation and header jars to Make App implementation and header jars are necessary for tests to run against apps. Test: m checkbuild Change-Id: Ia54ebf41f17346d3c59f3ec9512e68f195cdb67f --- java/androidmk.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/java/androidmk.go b/java/androidmk.go index 40ebe5bc7..24fe43ada 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -156,6 +156,12 @@ func (app *AndroidApp) AndroidMk() android.AndroidMkData { if app.dexJarFile != nil { fmt.Fprintln(w, "LOCAL_SOONG_DEX_JAR :=", app.dexJarFile.String()) } + if app.implementationJarFile != nil { + fmt.Fprintln(w, "LOCAL_SOONG_CLASSES_JAR :=", app.implementationJarFile) + } + if app.headerJarFile != nil { + fmt.Fprintln(w, "LOCAL_SOONG_HEADER_JAR :=", app.headerJarFile.String()) + } if app.jacocoReportClassesFile != nil { fmt.Fprintln(w, "LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR :=", app.jacocoReportClassesFile.String()) }