From 95b53b83eb81aead6b8945ba813452967dfae247 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 17 Oct 2023 13:21:02 -0700 Subject: [PATCH] Export resource processor R.jar files to ASfP Export the R.jar files generated by ResourceProcessorBusyBox to module_bp_java_deps.json for use by Android Studio for Platform. Bug: 305997998 Test: examine module_bp_java_deps.json Change-Id: I48e3e28b45219646765de7848ec9dbe77d14c662 --- java/aar.go | 11 +++++++++++ java/app.go | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/java/aar.go b/java/aar.go index 85a6fbb96..dabe40831 100644 --- a/java/aar.go +++ b/java/aar.go @@ -819,6 +819,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. // // An android_library has a single variant that produces a `.jar` file containing `.class` files that were diff --git a/java/app.go b/java/app.go index ce94ababd..0cb72e256 100755 --- a/java/app.go +++ b/java/app.go @@ -1073,6 +1073,11 @@ func (a *AndroidApp) EnableCoverageIfNeeded() {} 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. func AndroidAppFactory() android.Module { module := &AndroidApp{}