diff options
author | 2024-01-09 22:53:52 +0000 | |
---|---|---|
committer | 2024-01-10 14:03:29 +0000 | |
commit | acae2d765654a0b1297b35a1de60b4fff2172870 (patch) | |
tree | 994a6e62a05438b362aa475db6ee914e1efe6c9b | |
parent | 1e0a69a02e628d8d674b7283780c0f6aa8f6fe7e (diff) |
move SetAconfigFileMkEntries to android
This will need to be called by some modules handled in android.
Bug: 308625757
Test: manual
Change-Id: Ic56e8ef3a453c59866aab6d39a21108cf8536b56
-rw-r--r-- | aconfig/aconfig_declarations.go | 15 | ||||
-rw-r--r-- | android/aconfig_providers.go | 15 | ||||
-rw-r--r-- | cc/androidmk.go | 4 | ||||
-rw-r--r-- | java/androidmk.go | 9 | ||||
-rw-r--r-- | rust/androidmk.go | 3 |
5 files changed, 21 insertions, 25 deletions
diff --git a/aconfig/aconfig_declarations.go b/aconfig/aconfig_declarations.go index b55d7bf5c..78f506a04 100644 --- a/aconfig/aconfig_declarations.go +++ b/aconfig/aconfig_declarations.go @@ -164,18 +164,3 @@ func (module *DeclarationsModule) GenerateAndroidBuildActions(ctx android.Module }) } - -func SetAconfigFileMkEntries(m *android.ModuleBase, entries *android.AndroidMkEntries, aconfigFiles map[string]android.Paths) { - // TODO(b/311155208): The default container here should be system. - container := "" - - if m.SocSpecific() { - container = "vendor" - } else if m.ProductSpecific() { - container = "product" - } else if m.SystemExtSpecific() { - container = "system_ext" - } - - entries.SetPaths("LOCAL_ACONFIG_FILES", aconfigFiles[container]) -} diff --git a/android/aconfig_providers.go b/android/aconfig_providers.go index 11fc6600d..b10036ee7 100644 --- a/android/aconfig_providers.go +++ b/android/aconfig_providers.go @@ -96,3 +96,18 @@ func mergeAconfigFiles(ctx ModuleContext, inputs Paths) Paths { return Paths{output} } + +func SetAconfigFileMkEntries(m *ModuleBase, entries *AndroidMkEntries, aconfigFiles map[string]Paths) { + // TODO(b/311155208): The default container here should be system. + container := "" + + if m.SocSpecific() { + container = "vendor" + } else if m.ProductSpecific() { + container = "product" + } else if m.SystemExtSpecific() { + container = "system_ext" + } + + entries.SetPaths("LOCAL_ACONFIG_FILES", aconfigFiles[container]) +} diff --git a/cc/androidmk.go b/cc/androidmk.go index 786d2bca2..7723dc38f 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -15,8 +15,6 @@ package cc import ( - "android/soong/aconfig" - "github.com/google/blueprint/proptools" "fmt" @@ -127,7 +125,7 @@ func (c *Module) AndroidMkEntries() []android.AndroidMkEntries { entries.SetString("SOONG_SDK_VARIANT_MODULES", "$(SOONG_SDK_VARIANT_MODULES) $(patsubst %.sdk,%,$(LOCAL_MODULE))") } - aconfig.SetAconfigFileMkEntries(c.AndroidModuleBase(), entries, c.mergedAconfigFiles) + android.SetAconfigFileMkEntries(c.AndroidModuleBase(), entries, c.mergedAconfigFiles) }, }, ExtraFooters: []android.AndroidMkExtraFootersFunc{ diff --git a/java/androidmk.go b/java/androidmk.go index cbf9abb96..cc0efe9b8 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -19,7 +19,6 @@ import ( "io" "strings" - "android/soong/aconfig" "android/soong/android" "github.com/google/blueprint/proptools" @@ -129,7 +128,7 @@ func (library *Library) AndroidMkEntries() []android.AndroidMkEntries { if library.dexpreopter.configPath != nil { entries.SetPath("LOCAL_SOONG_DEXPREOPT_CONFIG", library.dexpreopter.configPath) } - aconfig.SetAconfigFileMkEntries(&library.ModuleBase, entries, library.mergedAconfigFiles) + android.SetAconfigFileMkEntries(&library.ModuleBase, entries, library.mergedAconfigFiles) }, }, }) @@ -302,7 +301,7 @@ func (binary *Binary) AndroidMkEntries() []android.AndroidMkEntries { if len(binary.dexpreopter.builtInstalled) > 0 { entries.SetString("LOCAL_SOONG_BUILT_INSTALLED", binary.dexpreopter.builtInstalled) } - aconfig.SetAconfigFileMkEntries(&binary.ModuleBase, entries, binary.mergedAconfigFiles) + android.SetAconfigFileMkEntries(&binary.ModuleBase, entries, binary.mergedAconfigFiles) }, }, ExtraFooters: []android.AndroidMkExtraFootersFunc{ @@ -455,7 +454,7 @@ func (app *AndroidApp) AndroidMkEntries() []android.AndroidMkEntries { entries.SetOptionalPaths("LOCAL_SOONG_LINT_REPORTS", app.linter.reports) if app.Name() != "framework-res" { - aconfig.SetAconfigFileMkEntries(&app.ModuleBase, entries, app.mergedAconfigFiles) + android.SetAconfigFileMkEntries(&app.ModuleBase, entries, app.mergedAconfigFiles) } }, }, @@ -533,7 +532,7 @@ func (a *AndroidLibrary) AndroidMkEntries() []android.AndroidMkEntries { entries.SetPath("LOCAL_FULL_MANIFEST_FILE", a.mergedManifestFile) entries.SetPath("LOCAL_SOONG_EXPORT_PROGUARD_FLAGS", a.combinedExportedProguardFlagsFile) entries.SetBoolIfTrue("LOCAL_UNINSTALLABLE_MODULE", true) - aconfig.SetAconfigFileMkEntries(&a.ModuleBase, entries, a.mergedAconfigFiles) + android.SetAconfigFileMkEntries(&a.ModuleBase, entries, a.mergedAconfigFiles) }) return entriesList diff --git a/rust/androidmk.go b/rust/androidmk.go index c355a5642..17fd2d8be 100644 --- a/rust/androidmk.go +++ b/rust/androidmk.go @@ -17,7 +17,6 @@ package rust import ( "path/filepath" - "android/soong/aconfig" "android/soong/android" ) @@ -67,7 +66,7 @@ func (mod *Module) AndroidMkEntries() []android.AndroidMkEntries { if mod.UseVndk() { entries.SetBool("LOCAL_USE_VNDK", true) } - aconfig.SetAconfigFileMkEntries(mod.AndroidModuleBase(), entries, mod.mergedAconfigFiles) + android.SetAconfigFileMkEntries(mod.AndroidModuleBase(), entries, mod.mergedAconfigFiles) }, }, } |