From afe7baf47db292f1837d658a42dd3920b8e2bc10 Mon Sep 17 00:00:00 2001 From: LaMont Jones Date: Tue, 9 Jan 2024 22:47:39 +0000 Subject: Propagate aconfig providers for more modules. Bug: 308625757 Test: manual Change-Id: Iaf6d45a4259f1c6c34476c34c431344283ae2830 --- python/binary.go | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'python/binary.go') 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} -- cgit v1.2.3-59-g8ed1b