Merge "Revert "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN"" into main

This commit is contained in:
Treehugger Robot
2023-08-23 06:34:30 +00:00
committed by Gerrit Code Review
3 changed files with 10 additions and 16 deletions

View File

@@ -1948,10 +1948,6 @@ 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

@@ -452,7 +452,6 @@ type ProductVariables struct {
BuildBrokenTrebleSyspropNeverallow bool `json:",omitempty"` BuildBrokenTrebleSyspropNeverallow bool `json:",omitempty"`
BuildBrokenUsesSoongPython2Modules bool `json:",omitempty"` BuildBrokenUsesSoongPython2Modules bool `json:",omitempty"`
BuildBrokenVendorPropertyNamespace bool `json:",omitempty"` BuildBrokenVendorPropertyNamespace bool `json:",omitempty"`
BuildBrokenVendorSeappUsesCoredomain bool `json:",omitempty"`
BuildBrokenInputDirModules []string `json:",omitempty"` BuildBrokenInputDirModules []string `json:",omitempty"`
BuildWarningBadOptionalUsesLibsAllowlist []string `json:",omitempty"` BuildWarningBadOptionalUsesLibsAllowlist []string `json:",omitempty"`

View File

@@ -247,7 +247,6 @@ 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",