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

Merge "Export resource processor R.jar files to ASfP" into main am: c292fa1797 am: 8b57d1d786 am: 81a4d1ee2f

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

Change-Id: Iabf13796e8a91e38332ec1c9140c10555b052d87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Colin Cross 2023-10-18 19:19:03 +00:00 committed by Automerger Merge Worker
commit a2deb31959
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
java/aar.go
View file

@ -851,6 +851,17 @@ func (a *AndroidLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext)
} }
} }
func (a *AndroidLibrary) IDEInfo(dpInfo *android.IdeInfo) {
a.Library.IDEInfo(dpInfo)
a.aapt.IDEInfo(dpInfo)
}
func (a *aapt) IDEInfo(dpInfo *android.IdeInfo) {
if a.useResourceProcessorBusyBox() {
dpInfo.Jars = append(dpInfo.Jars, a.rJar.String())
}
}
// android_library builds and links sources into a `.jar` file for the device along with Android resources. // android_library builds and links sources into a `.jar` file for the device along with Android resources.
// //
// An android_library has a single variant that produces a `.jar` file containing `.class` files that were // An android_library has a single variant that produces a `.jar` file containing `.class` files that were

5
java/app.go
View file

@ -1073,6 +1073,11 @@ func (a *AndroidApp) EnableCoverageIfNeeded() {}
var _ cc.Coverage = (*AndroidApp)(nil) var _ cc.Coverage = (*AndroidApp)(nil)
func (a *AndroidApp) IDEInfo(dpInfo *android.IdeInfo) {
a.Library.IDEInfo(dpInfo)
a.aapt.IDEInfo(dpInfo)
}
// android_app compiles sources and Android resources into an Android application package `.apk` file. // android_app compiles sources and Android resources into an Android application package `.apk` file.
func AndroidAppFactory() android.Module { func AndroidAppFactory() android.Module {
module := &AndroidApp{} module := &AndroidApp{}