From ec71dfbe5fc395aa618f4cef6d9ef57d9a2cf9df Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Tue, 18 Feb 2025 13:31:12 -0800 Subject: Install tradefed dynamic config file in soong-only builds Make has this behavior where it will find a DynamicConfig.xml file in the same directory in the module and install it next to the main tradefed config file. Recreate that behavior in soong-only builds. https://cs.android.com/android/platform/superproject/main/+/main:build/make/core/base_rules.mk;l=859;drc=6a8fff595ba4cbb87b7e124fd630f548c5c4e2cb Bug: 396761822 Test: SOONG_ONLY=true atest -m -c CtsNetTestCases -- --test-arg com.android.testutils.ConnectivityTestTargetPreparer:ignore-mobile-data-check:true Change-Id: I69f1c262200d62cc0d3c590b6adbeb401af63ab9 --- python/test.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'python') diff --git a/python/test.go b/python/test.go index 5e70fc185..df62ab794 100644 --- a/python/test.go +++ b/python/test.go @@ -224,6 +224,10 @@ func (p *PythonTestModule) GenerateAndroidBuildActions(ctx android.ModuleContext if p.testConfig != nil { ctx.InstallFile(testCases, ctx.ModuleName()+".config", p.testConfig) } + dynamicConfig := android.ExistentPathForSource(ctx, ctx.ModuleDir(), "DynamicConfig.xml") + if dynamicConfig.Valid() { + ctx.InstallFile(testCases, ctx.ModuleName()+".dynamic", dynamicConfig.Path()) + } } // Install tests and data in arch specific subdir $PRODUCT_OUT/testcases/$module/$arch testCases = testCases.Join(ctx, ctx.Target().Arch.ArchType.String()) -- cgit v1.2.3-59-g8ed1b