diff options
| author | Colin Cross <ccross@android.com> | 2019-01-14 14:13:51 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-01-14 14:13:51 -0800 |
| commit | 462963b513fd54d36de0c18cc2436d751518d3b4 (patch) | |
| tree | 92312a62926a6d16d6b15a73297d1fc71e591712 /java/androidmk.go | |
| parent | 1ad8142bd3646479aac5452e6372c04abdf3dac9 (diff) | |
| download | android_build_soong-462963b513fd54d36de0c18cc2436d751518d3b4.tar.gz android_build_soong-462963b513fd54d36de0c18cc2436d751518d3b4.tar.bz2 android_build_soong-462963b513fd54d36de0c18cc2436d751518d3b4.zip | |
Set LOCAL_PREBUILT_MODULE_FILE for hostdex modules
Java modules with hostdex: true have to manually create an extra
androidmk entry, which was missing LOCAL_PREBUILT_MODULE_FILE.
Test: m checkbuild
Change-Id: I0fb50196fe01ba9eb0c4aef446e7c8f28bbaec12
Diffstat (limited to 'java/androidmk.go')
| -rw-r--r-- | java/androidmk.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index 4d3af12f..930354e4 100644 --- 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") } |