tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Update soong copy of java binaries when Make copy is installed"

Browse source
This commit is contained in:
Treehugger Robot 2021-02-23 21:35:20 +00:00 committed by Gerrit Code Review
commit 9a4279309f
1 changed files with 8 additions and 1 deletions
Show stats 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)