diff options
| author | 2025-01-24 00:25:30 +0000 | |
|---|---|---|
| committer | 2025-01-28 06:19:58 +0000 | |
| commit | d406381eadbbd411833a3e6829c9f2ade29da7ba (patch) | |
| tree | e67c2f15267feb885d4fe6de6bbfcdffa3f66c9c /android/module_info_json.go | |
| parent | f83bfb1ef01fc8eb46dfc400dcdefe6713e72306 (diff) | |
Convert java modules' module-info.json to Soong
This change converts the module-info.json of java_library
and other java modules that call java_library's
GenerateAndroidBuildActions() in its
GenerateAndroidBuildActions() to Soong.
Bug: 389720048
Test: Inspect module-info.json diff, CI
Change-Id: I0db5ae3a5fb41bb60dc538aea2d8e614c9ae23d4
Diffstat (limited to 'android/module_info_json.go')
| -rw-r--r-- | android/module_info_json.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/android/module_info_json.go b/android/module_info_json.go index 27120ef6f..f7bffdb51 100644 --- a/android/module_info_json.go +++ b/android/module_info_json.go @@ -34,7 +34,7 @@ type ExtraModuleInfoJSON struct { SrcJars []string `json:"srcjars,omitempty"` // $(sort $(ALL_MODULES.$(m).SRCJARS)) ClassesJar []string `json:"classes_jar,omitempty"` // $(sort $(ALL_MODULES.$(m).CLASSES_JAR)) TestMainlineModules []string `json:"test_mainline_modules,omitempty"` // $(sort $(ALL_MODULES.$(m).TEST_MAINLINE_MODULES)) - IsUnitTest bool `json:"is_unit_test,omitempty"` // $(ALL_MODULES.$(m).IS_UNIT_TEST) + IsUnitTest string `json:"is_unit_test,omitempty"` // $(ALL_MODULES.$(m).IS_UNIT_TEST) TestOptionsTags []string `json:"test_options_tags,omitempty"` // $(sort $(ALL_MODULES.$(m).TEST_OPTIONS_TAGS)) RuntimeDependencies []string `json:"runtime_dependencies,omitempty"` // $(sort $(ALL_MODULES.$(m).LOCAL_RUNTIME_LIBRARIES)) StaticDependencies []string `json:"static_dependencies,omitempty"` // $(sort $(ALL_MODULES.$(m).LOCAL_STATIC_LIBRARIES)) @@ -44,6 +44,11 @@ type ExtraModuleInfoJSON struct { 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:"-"` + + SupportedVariantsOverride []string `json:"-"` + Disabled bool `json:"-"` + RegisterNameOverride string `json:"-"` + ModuleNameOverride string `json:"-"` } type ModuleInfoJSON struct { @@ -128,4 +133,4 @@ func (m *ModuleInfoJSON) GobDecode(data []byte) error { return gobtools.CustomGobDecode[combinedModuleInfoJSON](data, m) } -var ModuleInfoJSONProvider = blueprint.NewProvider[*ModuleInfoJSON]() +var ModuleInfoJSONProvider = blueprint.NewProvider[[]*ModuleInfoJSON]() |