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
diff --git a/sh/sh_binary.go b/sh/sh_binary.go
index 7041642..2a6b6c9 100644
--- a/sh/sh_binary.go
+++ b/sh/sh_binary.go
@@ -613,6 +613,8 @@
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)
},
},