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

Merge "Remove more internal fields from ModuleBase." into main am: fb995a1e3c

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

Change-Id: Icafa7150b5320cbff6dffaef15453a078f39c9a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yu Liu
2024-08-16 22:27:52 +00:00
committed by Automerger Merge Worker
parent 45e2c9ba92 fb995a1e3c
commit a5c0d1f355
15 changed files with 66 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/app.go
View File

@@ -1109,7 +1109,7 @@ func collectJniDeps(ctx android.ModuleContext,
coverageFile: dep.CoverageOutputFile(),
unstrippedFile: dep.UnstrippedOutputFile(),
partition: dep.Partition(),
installPaths: android.ModuleFilesToInstall(ctx, dep),
installPaths: android.OtherModuleProviderOrDefault(ctx, dep, android.InstallFilesProvider).InstallFiles,
})
} else if ctx.Config().AllowMissingDependencies() {
ctx.AddMissingDependencies([]string{otherName})

9
java/ravenwood.go
View File

@@ -152,7 +152,8 @@ func (r *ravenwoodTest) GenerateAndroidBuildActions(ctx android.ModuleContext) {
var runtimeJniModuleNames map[string]bool
if utils := ctx.GetDirectDepsWithTag(ravenwoodUtilsTag)[0]; utils != nil {
for _, installFile := range android.ModuleFilesToInstall(ctx, utils) {
for _, installFile := range android.OtherModuleProviderOrDefault(
ctx, utils, android.InstallFilesProvider).InstallFiles {
installDeps = append(installDeps, installFile)
}
jniDeps, ok := android.OtherModuleProvider(ctx, utils, ravenwoodLibgroupJniDepProvider)
@@ -162,7 +163,8 @@ func (r *ravenwoodTest) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
if runtime := ctx.GetDirectDepsWithTag(ravenwoodRuntimeTag)[0]; runtime != nil {
for _, installFile := range android.ModuleFilesToInstall(ctx, runtime) {
for _, installFile := range android.OtherModuleProviderOrDefault(
ctx, runtime, android.InstallFilesProvider).InstallFiles {
installDeps = append(installDeps, installFile)
}
jniDeps, ok := android.OtherModuleProvider(ctx, runtime, ravenwoodLibgroupJniDepProvider)
@@ -191,7 +193,8 @@ func (r *ravenwoodTest) GenerateAndroidBuildActions(ctx android.ModuleContext) {
resApkInstallPath := installPath.Join(ctx, "ravenwood-res-apks")
if resApk := ctx.GetDirectDepsWithTag(ravenwoodTestResourceApkTag); len(resApk) > 0 {
for _, installFile := range android.ModuleFilesToInstall(ctx, resApk[0]) {
for _, installFile := range android.OtherModuleProviderOrDefault(
ctx, resApk[0], android.InstallFilesProvider).InstallFiles {
installResApk := ctx.InstallFile(resApkInstallPath, "ravenwood-res.apk", installFile)
installDeps = append(installDeps, installResApk)
}