From 40182b6ff33ed7d91837212000524e74bf2392c7 Mon Sep 17 00:00:00 2001 From: Justin Yun Date: Tue, 7 May 2024 10:22:19 +0900 Subject: Remove duplicated CollectDependencyAconfigFiles() android.ModuleBase already calls aconfigUpdateAndroidBuildActions() that is the same with CollectDependencyAconfigFiles(). Remove the CollectDependencyAconfigFiles() to avoid duplication with aconfigUpdateAndroidBuildActions(). To make the aconfig information available in GenerateAndroidBuildActions() of all modules, call aconfigUpdateAndroidBuildActions() before calling GenerateAndroidBuildActions() of each module. Also, we don't need SetAconfigFileMkEntries(), which is a duplicate of aconfigUpdateAndroidMkData() Bug: 335363964 Test: diff `adb shell printflags` before and after the change. Change-Id: I52808e442e9fed7db1eae7b7c5ed0b1c5ba74f5d --- python/test.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'python/test.go') diff --git a/python/test.go b/python/test.go index 2b939e7e4..85decf931 100644 --- a/python/test.go +++ b/python/test.go @@ -18,6 +18,7 @@ import ( "fmt" "android/soong/testing" + "github.com/google/blueprint/proptools" "android/soong/android" @@ -151,7 +152,6 @@ 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 @@ -227,7 +227,6 @@ 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) }) -- cgit v1.2.3-59-g8ed1b