Merge "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN" into main

This commit is contained in:
Treehugger Robot
2023-08-22 02:09:45 +00:00
committed by Gerrit Code Review
3 changed files with 16 additions and 10 deletions

View File

@@ -1948,6 +1948,10 @@ func (c *deviceConfig) BuildBrokenVendorPropertyNamespace() bool {
return c.config.productVariables.BuildBrokenVendorPropertyNamespace return c.config.productVariables.BuildBrokenVendorPropertyNamespace
} }
func (c *deviceConfig) BuildBrokenVendorSeappUsesCoredomain() bool {
return c.config.productVariables.BuildBrokenVendorSeappUsesCoredomain
}
func (c *deviceConfig) BuildBrokenInputDir(name string) bool { func (c *deviceConfig) BuildBrokenInputDir(name string) bool {
return InList(name, c.config.productVariables.BuildBrokenInputDirModules) return InList(name, c.config.productVariables.BuildBrokenInputDirModules)
} }

View File

@@ -443,16 +443,17 @@ type ProductVariables struct {
ShippingApiLevel *string `json:",omitempty"` ShippingApiLevel *string `json:",omitempty"`
BuildBrokenPluginValidation []string `json:",omitempty"` BuildBrokenPluginValidation []string `json:",omitempty"`
BuildBrokenClangAsFlags bool `json:",omitempty"` BuildBrokenClangAsFlags bool `json:",omitempty"`
BuildBrokenClangCFlags bool `json:",omitempty"` BuildBrokenClangCFlags bool `json:",omitempty"`
BuildBrokenClangProperty bool `json:",omitempty"` BuildBrokenClangProperty bool `json:",omitempty"`
GenruleSandboxing *bool `json:",omitempty"` GenruleSandboxing *bool `json:",omitempty"`
BuildBrokenEnforceSyspropOwner bool `json:",omitempty"` BuildBrokenEnforceSyspropOwner bool `json:",omitempty"`
BuildBrokenTrebleSyspropNeverallow bool `json:",omitempty"` BuildBrokenTrebleSyspropNeverallow bool `json:",omitempty"`
BuildBrokenUsesSoongPython2Modules bool `json:",omitempty"` BuildBrokenUsesSoongPython2Modules bool `json:",omitempty"`
BuildBrokenVendorPropertyNamespace bool `json:",omitempty"` BuildBrokenVendorPropertyNamespace bool `json:",omitempty"`
BuildBrokenInputDirModules []string `json:",omitempty"` BuildBrokenVendorSeappUsesCoredomain bool `json:",omitempty"`
BuildBrokenInputDirModules []string `json:",omitempty"`
BuildWarningBadOptionalUsesLibsAllowlist []string `json:",omitempty"` BuildWarningBadOptionalUsesLibsAllowlist []string `json:",omitempty"`

View File

@@ -247,6 +247,7 @@ func runMakeProductConfig(ctx Context, config Config) {
"DEFAULT_ERROR_BUILD_MODULE_TYPES", "DEFAULT_ERROR_BUILD_MODULE_TYPES",
"BUILD_BROKEN_PREBUILT_ELF_FILES", "BUILD_BROKEN_PREBUILT_ELF_FILES",
"BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW", "BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW",
"BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN",
"BUILD_BROKEN_USES_BUILD_COPY_HEADERS", "BUILD_BROKEN_USES_BUILD_COPY_HEADERS",
"BUILD_BROKEN_USES_BUILD_EXECUTABLE", "BUILD_BROKEN_USES_BUILD_EXECUTABLE",
"BUILD_BROKEN_USES_BUILD_FUZZ_TEST", "BUILD_BROKEN_USES_BUILD_FUZZ_TEST",