diff options
author | 2025-03-04 11:34:55 -0800 | |
---|---|---|
committer | 2025-03-04 11:34:55 -0800 | |
commit | 156085b945de668069e1a35de3a2d3cb4b31618d (patch) | |
tree | c2c6f44e6104c73a2297d30e238ffc023df304a1 /android/module_info_json.go | |
parent | de3a5c4be8aff15998cbf898e06fcc4679fe911f (diff) |
Build test_module_config modules' module_info_json in soong
To be able to run these tests in soong-only builds.
This cl produces the following diff:
https://paste.googleplex.com/4917659043627008
The diff is enitrely additional host dependencies. Without the line
adding the ExtraHostRequired modules it becomes a diff of missing
host dependencies. Of the two I chose the extras. It's difficult to get
the required list exactly matching make.
Fixes: 400731860
Test: The diff + atest CtsWifiTestCases_NoNonMainlineTest
Change-Id: Idbbfbf7f74eb2eeaf68d64c0bcfbc97ddae3e2ea
Diffstat (limited to 'android/module_info_json.go')
-rw-r--r-- | android/module_info_json.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/android/module_info_json.go b/android/module_info_json.go index bb309ffee..50c961abe 100644 --- a/android/module_info_json.go +++ b/android/module_info_json.go @@ -40,10 +40,12 @@ type ExtraModuleInfoJSON struct { StaticDependencies []string `json:"static_dependencies,omitempty"` // $(sort $(ALL_MODULES.$(m).LOCAL_STATIC_LIBRARIES)) DataDependencies []string `json:"data_dependencies,omitempty"` // $(sort $(ALL_MODULES.$(m).TEST_DATA_BINS)) - CompatibilitySuites []string `json:"compatibility_suites,omitempty"` // $(sort $(ALL_MODULES.$(m).COMPATIBILITY_SUITES)) - AutoTestConfig []string `json:"auto_test_config,omitempty"` // $(ALL_MODULES.$(m).auto_test_config) - TestConfig []string `json:"test_config,omitempty"` // $(strip $(ALL_MODULES.$(m).TEST_CONFIG) $(ALL_MODULES.$(m).EXTRA_TEST_CONFIGS) - ExtraRequired []string `json:"-"` + CompatibilitySuites []string `json:"compatibility_suites,omitempty"` // $(sort $(ALL_MODULES.$(m).COMPATIBILITY_SUITES)) + AutoTestConfig []string `json:"auto_test_config,omitempty"` // $(ALL_MODULES.$(m).auto_test_config) + TestConfig []string `json:"test_config,omitempty"` // $(strip $(ALL_MODULES.$(m).TEST_CONFIG) $(ALL_MODULES.$(m).EXTRA_TEST_CONFIGS) + TestModuleConfigBase string `json:"test_module_config_base,omitempty"` + ExtraRequired []string `json:"-"` + ExtraHostRequired []string `json:"-"` SupportedVariantsOverride []string `json:"-"` Disabled bool `json:"-"` |