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

Merge "Write AndroidMk for api-versions.xml module" am: 55c157791e

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

Change-Id: Ic4f89a42241988ba7b318e425b5173d5d49117c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Anton Hansson
2022-05-11 20:38:16 +00:00
committed by Automerger Merge Worker
parent 4f1ca80323 55c157791e
commit adfab19c93
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/androidmk.go
View File

@@ -542,6 +542,9 @@ func (dstubs *Droidstubs) AndroidMkEntries() []android.AndroidMkEntries {
if !outputFile.Valid() { if !outputFile.Valid() {
outputFile = android.OptionalPathForPath(dstubs.apiFile) outputFile = android.OptionalPathForPath(dstubs.apiFile)
} }
if !outputFile.Valid() {
outputFile = android.OptionalPathForPath(dstubs.apiVersionsXml)
}
return []android.AndroidMkEntries{android.AndroidMkEntries{ return []android.AndroidMkEntries{android.AndroidMkEntries{
Class: "JAVA_LIBRARIES", Class: "JAVA_LIBRARIES",
OutputFile: outputFile, OutputFile: outputFile,