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

Merge "rust: add aconfig_flag support" into main

Browse source
This commit is contained in:
Treehugger Robot 2023-12-08 19:35:28 +00:00 committed by Gerrit Code Review
commit 5ada6c2738
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
rust/Android.bp
View file

@ -7,6 +7,7 @@ bootstrap_go_package {
pkgPath: "android/soong/rust", pkgPath: "android/soong/rust",
deps: [ deps: [
"soong", "soong",
"soong-aconfig",
"soong-android", "soong-android",
"soong-bloaty", "soong-bloaty",
"soong-cc", "soong-cc",

3
rust/androidmk.go
View file

@ -66,7 +66,8 @@ func (mod *Module) AndroidMkEntries() []android.AndroidMkEntries {
if mod.UseVndk() { if mod.UseVndk() {
entries.SetBool("LOCAL_USE_VNDK", true) entries.SetBool("LOCAL_USE_VNDK", true)
} }
// TODO(b/311155208): The container here should be system.
entries.SetPaths("LOCAL_ACONFIG_FILES", mod.mergedAconfigFiles[""])
}, },
}, },
} }

6
rust/rust.go
View file

@ -26,6 +26,7 @@ import (
"github.com/google/blueprint" "github.com/google/blueprint"
"github.com/google/blueprint/proptools" "github.com/google/blueprint/proptools"
"android/soong/aconfig"
"android/soong/android" "android/soong/android"
"android/soong/cc" "android/soong/cc"
cc_config "android/soong/cc/config" cc_config "android/soong/cc/config"
@ -176,6 +177,9 @@ type Module struct {
transitiveAndroidMkSharedLibs *android.DepSet[string] transitiveAndroidMkSharedLibs *android.DepSet[string]
android.BazelModuleBase android.BazelModuleBase
// Aconfig files for all transitive deps. Also exposed via TransitiveDeclarationsInfo
mergedAconfigFiles map[string]android.Paths
} }
func (mod *Module) Header() bool { func (mod *Module) Header() bool {
@ -1006,6 +1010,8 @@ func (mod *Module) GenerateAndroidBuildActions(actx android.ModuleContext) {
if mod.testModule { if mod.testModule {
ctx.SetProvider(testing.TestModuleProviderKey, testing.TestModuleProviderData{}) ctx.SetProvider(testing.TestModuleProviderKey, testing.TestModuleProviderData{})
} }
aconfig.CollectDependencyAconfigFiles(ctx, &mod.mergedAconfigFiles)
} }
func (mod *Module) deps(ctx DepsContext) Deps { func (mod *Module) deps(ctx DepsContext) Deps {