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

Merge "Modify Soong to utilize from-text android.jar in build" am: bc2906efef am: e518bf7c3d am: 5746993043

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

Change-Id: Ibb008c511597b5746bc9c70c9368c4a3fe3322da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-03-30 17:43:57 +00:00
committed by Automerger Merge Worker
parent 7e6b3d60ac 5746993043
commit ffddc94522
7 changed files with 71 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
java/androidmk.go
View File

@@ -739,3 +739,22 @@ func (apkSet *AndroidAppSet) AndroidMkEntries() []android.AndroidMkEntries {
},
}
}
func (al *ApiLibrary) AndroidMkEntries() []android.AndroidMkEntries {
var entriesList []android.AndroidMkEntries
entriesList = append(entriesList, android.AndroidMkEntries{
Class: "JAVA_LIBRARIES",
OutputFile: android.OptionalPathForPath(al.stubsJar),
Include: "$(BUILD_SYSTEM)/soong_java_prebuilt.mk",
ExtraEntries: []android.AndroidMkExtraEntriesFunc{
func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
entries.SetBoolIfTrue("LOCAL_UNINSTALLABLE_MODULE", true)
entries.SetPath("LOCAL_SOONG_CLASSES_JAR", al.stubsJar)
entries.SetPath("LOCAL_SOONG_HEADER_JAR", al.stubsJar)
},
},
})
return entriesList
}