diff options
| author | 2025-03-14 13:56:29 -0700 | |
|---|---|---|
| committer | 2025-03-14 14:02:37 -0700 | |
| commit | cee7c610a33269c7563656a713c48f4270e49cab (patch) | |
| tree | 1d79b1d934b1e1d4f20c7790cc9415b9eb744fa5 /sh | |
| parent | 18548fd4d847dea2090e8763d00f4d0ee22f21d0 (diff) | |
Set LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG on sh_test
If auto_generate_test_config is false. Without this line, soong is not
autogenerating a test config, but make still is. And the
make-autogenerated test config file is invalid, it has a
{EXTRA_TEST_RUNNER_CONFIGS} placeholder in it that's only replaced
in soong code, not make code.
Bug: 388850000
Test: m device-tests
Change-Id: I8b2686fa68996d58ef4f5769047ff9ec418eaca5
Diffstat (limited to 'sh')
| -rw-r--r-- | sh/sh_binary.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sh/sh_binary.go b/sh/sh_binary.go index 7041642e0..2a6b6c9e7 100644 --- a/sh/sh_binary.go +++ b/sh/sh_binary.go @@ -613,6 +613,8 @@ func (s *ShTest) AndroidMkEntries() []android.AndroidMkEntries { entries.AddStrings("LOCAL_EXTRA_FULL_TEST_CONFIGS", s.extraTestConfigs.Strings()...) } + entries.SetBoolIfTrue("LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG", !proptools.BoolDefault(s.testProperties.Auto_gen_config, true)) + s.testProperties.Test_options.SetAndroidMkEntries(entries) }, }, |