StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update soong copy of java binaries when Make copy is installed" am: 9a4279309f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1602454

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib831c8a9b6eed2f4da99bb51d1a2bb352ef8163a
This commit is contained in:
Treehugger Robot
2021-02-24 01:30:17 +00:00
committed by Automerger Merge Worker
parent d078b18f64 9a4279309f
commit 5ee786ff3f
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/androidmk.go
View File

@@ -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)