diff options
| author | Scott Lobdell <slobdell@google.com> | 2021-03-11 19:08:45 +0000 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2021-03-16 00:44:22 +0000 |
| commit | 85534c36f81cf1557ddaa01605199bfc3a9fd76c (patch) | |
| tree | f9b65ea011ac58731bc866a621f526ea8fa7e39f /java/androidmk.go | |
| parent | 5989878a55d2d34a1a8e5e16bb37349c4949758b (diff) | |
| parent | edc1fc38c73698499b37c40435b25ef2a5ade887 (diff) | |
Merge SP1A.210311.001
Change-Id: I28e9aad9ed4dd91092fd24efb136f0aac7bdb68e
Diffstat (limited to 'java/androidmk.go')
| -rw-r--r-- | java/androidmk.go | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index e7261f894..3d3eae530 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -220,7 +220,7 @@ func (prebuilt *DexImport) AndroidMkEntries() []android.AndroidMkEntries { } return []android.AndroidMkEntries{android.AndroidMkEntries{ Class: "JAVA_LIBRARIES", - OutputFile: android.OptionalPathForPath(prebuilt.maybeStrippedDexJarFile), + OutputFile: android.OptionalPathForPath(prebuilt.dexJarFile), Include: "$(BUILD_SYSTEM)/soong_java_prebuilt.mk", ExtraEntries: []android.AndroidMkExtraEntriesFunc{ func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) { @@ -287,9 +287,16 @@ func (binary *Binary) AndroidMkEntries() []android.AndroidMkEntries { }, }} } else { + outputFile := binary.wrapperFile + // Have Make installation trigger Soong installation by using Soong's install path as + // the output file. + if binary.Host() { + outputFile = binary.binaryFile + } + return []android.AndroidMkEntries{android.AndroidMkEntries{ Class: "EXECUTABLES", - OutputFile: android.OptionalPathForPath(binary.wrapperFile), + OutputFile: android.OptionalPathForPath(outputFile), ExtraEntries: []android.AndroidMkExtraEntriesFunc{ func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) { entries.SetBool("LOCAL_STRIP_MODULE", false) |