From 3a61b6edae22b45f27b134de9548524dafeb17ff Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Wed, 23 Aug 2023 02:07:40 +0000 Subject: [PATCH] Revert "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN" Revert submission 2715179-BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN Reason for revert: not needed Reverted changes: /q/submissionid:2715179-BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN Change-Id: I3bc8f2006b2f82159ae308467ea74ad62a60ec6f --- android/config.go | 4 ---- android/variable.go | 21 ++++++++++----------- ui/build/dumpvars.go | 1 - 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/android/config.go b/android/config.go index 7e3bc7a29..3e7bb1426 100644 --- a/android/config.go +++ b/android/config.go @@ -1948,10 +1948,6 @@ func (c *deviceConfig) BuildBrokenVendorPropertyNamespace() bool { return c.config.productVariables.BuildBrokenVendorPropertyNamespace } -func (c *deviceConfig) BuildBrokenVendorSeappUsesCoredomain() bool { - return c.config.productVariables.BuildBrokenVendorSeappUsesCoredomain -} - func (c *deviceConfig) BuildBrokenInputDir(name string) bool { return InList(name, c.config.productVariables.BuildBrokenInputDirModules) } diff --git a/android/variable.go b/android/variable.go index 04e407f3c..ca9a221b1 100644 --- a/android/variable.go +++ b/android/variable.go @@ -443,17 +443,16 @@ type ProductVariables struct { ShippingApiLevel *string `json:",omitempty"` - BuildBrokenPluginValidation []string `json:",omitempty"` - BuildBrokenClangAsFlags bool `json:",omitempty"` - BuildBrokenClangCFlags bool `json:",omitempty"` - BuildBrokenClangProperty bool `json:",omitempty"` - GenruleSandboxing *bool `json:",omitempty"` - BuildBrokenEnforceSyspropOwner bool `json:",omitempty"` - BuildBrokenTrebleSyspropNeverallow bool `json:",omitempty"` - BuildBrokenUsesSoongPython2Modules bool `json:",omitempty"` - BuildBrokenVendorPropertyNamespace bool `json:",omitempty"` - BuildBrokenVendorSeappUsesCoredomain bool `json:",omitempty"` - BuildBrokenInputDirModules []string `json:",omitempty"` + BuildBrokenPluginValidation []string `json:",omitempty"` + BuildBrokenClangAsFlags bool `json:",omitempty"` + BuildBrokenClangCFlags bool `json:",omitempty"` + BuildBrokenClangProperty bool `json:",omitempty"` + GenruleSandboxing *bool `json:",omitempty"` + BuildBrokenEnforceSyspropOwner bool `json:",omitempty"` + BuildBrokenTrebleSyspropNeverallow bool `json:",omitempty"` + BuildBrokenUsesSoongPython2Modules bool `json:",omitempty"` + BuildBrokenVendorPropertyNamespace bool `json:",omitempty"` + BuildBrokenInputDirModules []string `json:",omitempty"` BuildWarningBadOptionalUsesLibsAllowlist []string `json:",omitempty"` diff --git a/ui/build/dumpvars.go b/ui/build/dumpvars.go index 681ca776f..efe747819 100644 --- a/ui/build/dumpvars.go +++ b/ui/build/dumpvars.go @@ -247,7 +247,6 @@ func runMakeProductConfig(ctx Context, config Config) { "DEFAULT_ERROR_BUILD_MODULE_TYPES", "BUILD_BROKEN_PREBUILT_ELF_FILES", "BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW", - "BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN", "BUILD_BROKEN_USES_BUILD_COPY_HEADERS", "BUILD_BROKEN_USES_BUILD_EXECUTABLE", "BUILD_BROKEN_USES_BUILD_FUZZ_TEST",