Merge "Set LOCAL_PREBUILT_MODULE_FILE for hostdex modules"

2019-01-15 23:39:25 +00:00
parent 0b475181a6 462963b513
commit ca0083554b
1 changed files with 5 additions and 0 deletions
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -75,6 +75,11 @@ func (library *Library) AndroidMk() android.AndroidMkData {
 				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")
 				}