diff options
| author | 2024-01-09 22:47:39 +0000 | |
|---|---|---|
| committer | 2024-01-10 14:03:30 +0000 | |
| commit | afe7baf47db292f1837d658a42dd3920b8e2bc10 (patch) | |
| tree | 861a720fc9651b8a4c1f412328f8497858d14d7d /python | |
| parent | acae2d765654a0b1297b35a1de60b4fff2172870 (diff) | |
Propagate aconfig providers for more modules.
Bug: 308625757
Test: manual
Change-Id: Iaf6d45a4259f1c6c34476c34c431344283ae2830
Diffstat (limited to 'python')
| -rw-r--r-- | python/binary.go | 5 | ||||
| -rw-r--r-- | python/test.go | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/python/binary.go b/python/binary.go index 85084a4f2..d6750c655 100644 --- a/python/binary.go +++ b/python/binary.go @@ -71,6 +71,9 @@ type PythonBinaryModule struct { installedDest android.Path androidMkSharedLibs []string + + // Aconfig files for all transitive deps. Also exposed via TransitiveDeclarationsInfo + mergedAconfigFiles map[string]android.Paths } var _ android.AndroidMkEntriesProvider = (*PythonBinaryModule)(nil) @@ -103,6 +106,7 @@ func (p *PythonBinaryModule) GenerateAndroidBuildActions(ctx android.ModuleConte p.buildBinary(ctx) p.installedDest = ctx.InstallFile(installDir(ctx, "bin", "", ""), p.installSource.Base(), p.installSource) + android.CollectDependencyAconfigFiles(ctx, &p.mergedAconfigFiles) } func (p *PythonBinaryModule) buildBinary(ctx android.ModuleContext) { @@ -166,6 +170,7 @@ func (p *PythonBinaryModule) AndroidMkEntries() []android.AndroidMkEntries { entries.SetString("LOCAL_MODULE_STEM", stem) entries.AddStrings("LOCAL_SHARED_LIBRARIES", p.androidMkSharedLibs...) entries.SetBool("LOCAL_CHECK_ELF_FILES", false) + android.SetAconfigFileMkEntries(&p.ModuleBase, entries, p.mergedAconfigFiles) }) return []android.AndroidMkEntries{entries} diff --git a/python/test.go b/python/test.go index 782f39f20..7eb913620 100644 --- a/python/test.go +++ b/python/test.go @@ -149,6 +149,7 @@ func (p *PythonTestModule) GenerateAndroidBuildActions(ctx android.ModuleContext // just use buildBinary() so that the binary is not installed into the location // it would be for regular binaries. p.PythonLibraryModule.GenerateAndroidBuildActions(ctx) + android.CollectDependencyAconfigFiles(ctx, &p.mergedAconfigFiles) p.buildBinary(ctx) var configs []tradefed.Option @@ -228,6 +229,7 @@ func (p *PythonTestModule) AndroidMkEntries() []android.AndroidMkEntries { } entries.SetBoolIfTrue("LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG", !BoolDefault(p.binaryProperties.Auto_gen_config, true)) + android.SetAconfigFileMkEntries(&p.ModuleBase, entries, p.mergedAconfigFiles) p.testProperties.Test_options.SetAndroidMkEntries(entries) }) |