Merge "Set LOCAL_PREBUILT_MODULE_FILE for hostdex modules" am: ca0083554b
am: 657d625d53
Change-Id: I8e621ab18546dffd3880525a2f9b7ea21f2dd47b
diff --git a/java/androidmk.go b/java/androidmk.go
index 4d3af12..930354e 100644
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -75,6 +75,11 @@
fmt.Fprintln(w, "LOCAL_MODULE := "+name+"-hostdex")
fmt.Fprintln(w, "LOCAL_IS_HOST_MODULE := true")
fmt.Fprintln(w, "LOCAL_MODULE_CLASS := JAVA_LIBRARIES")
+ if library.dexJarFile != nil {
+ fmt.Fprintln(w, "LOCAL_PREBUILT_MODULE_FILE :=", library.dexJarFile.String())
+ } else {
+ fmt.Fprintln(w, "LOCAL_PREBUILT_MODULE_FILE :=", library.implementationAndResourcesJar.String())
+ }
if library.installFile == nil {
fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE := true")
}