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

Merge "Add jarjar_prefix propagation support for aconfig_declarations_group module type" into main am: 0fd4bb8c70

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

Change-Id: I0aedb1a1c34054269666a6f25624c68e079a73f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Zi Wang
2024-02-17 02:07:27 +00:00
committed by Automerger Merge Worker
parent a9600a3d48 0fd4bb8c70
commit 2559a85af4
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/base.go
View File

@@ -26,6 +26,7 @@ import (
"github.com/google/blueprint/pathtools" "github.com/google/blueprint/pathtools"
"github.com/google/blueprint/proptools" "github.com/google/blueprint/proptools"
"android/soong/aconfig"
"android/soong/android" "android/soong/android"
"android/soong/dexpreopt" "android/soong/dexpreopt"
"android/soong/java/config" "android/soong/java/config"
@@ -2544,6 +2545,8 @@ func collectDirectDepsProviders(ctx android.ModuleContext) (result *JarJarProvid
default: default:
return RenameUseExclude, "srcfile" return RenameUseExclude, "srcfile"
} }
} else if _, ok := android.OtherModuleProvider(ctx, m, aconfig.CodegenInfoProvider); ok {
return RenameUseInclude, "aconfig_declarations_group"
} else { } else {
switch tag { switch tag {
case bootClasspathTag: case bootClasspathTag: