Remove unsupported release configs

This drops trunk_food, trunk, and next, none of which are supported
release configs, as well as enabling the new approach in all configs.

Bug: 328495189
Test: manual, TH
Merged-In: Ib02fc4dea3a6d96adb4a0d2b6a732249373844d9
Change-Id: Ia6b6654c0542394c1a5ceb506a74ac2a9aa5a01d

6 files changed, 2 insertions, 195 deletions

diff --git a/build_config/next.scl b/build_config/next.scl
deleted file mode 100644
index aef3e402..00000000
--- a/build_config/next.scl
+++ /dev/null
@@ -1,54 +0,0 @@
-"""
-Build flag values for release config next.
-"""
-# Copyright (C) 2023 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Build system flag configuration for `lunch <product>-next-<variant>` builds
-#                                                      ^^^^
-# See go/build-system-flags
-#
-
-load("//build/make/core/release_config.scl", "value")
-
-# Platform version variables
-platform_version_flags = [
-    value("RELEASE_BOARD_API_LEVEL", "202404"),
-    value("RELEASE_PLATFORM_SDK_EXTENSION_VERSION", "11"),
-    value("RELEASE_PLATFORM_SDK_VERSION", "34"),
-    value("RELEASE_PLATFORM_SECURITY_PATCH", "2024-01-05"),
-    value("RELEASE_PLATFORM_VERSION", "AP1A"),
-    value("RELEASE_PLATFORM_VERSION_ALL_CODENAMES", "REL"),
-    value("RELEASE_PLATFORM_VERSION_ALL_PREVIEW_CODENAMES", "REL,VanillaIceCream"),
-    value("RELEASE_PLATFORM_VERSION_CODENAME", "REL"),
-    value("RELEASE_PLATFORM_VERSION_LAST_STABLE", "14"),
-    value("RELEASE_PLATFORM_VNDK_VERSION", "35"),
-]
-
-# Flags should be alphabetical by flag name to reduce merge conflifcts
-values = [
-    value("RELEASE_ACONFIG_FLAG_DEFAULT_PERMISSION", "READ_ONLY"),
-    value("RELEASE_ACONFIG_VALUE_SETS", "aconfig_value_set-aosp-next"),
-    value("RELEASE_AIDL_USE_UNFROZEN", False),
-    value("RELEASE_AVF_ALLOW_PREINSTALLED_APPS", True),
-    value("RELEASE_DEPRECATE_VNDK", True),
-    value("RELEASE_PACKAGE_HENTAIGANA_FONT", True),
-    value("RELEASE_PACKAGE_LIBSQLITE3", "3440300"),
-    value("RELEASE_PACKAGE_LIBANDROID_RUNTIME_PUNCH_HOLES", True),
-    value("RELEASE_PACKAGE_TZDATA_MODULE", "com.android.tzdata"),
-    value("RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK", True),
-    value("RELEASE_REMOVE_LEGACY_EMOJI_FONT", True),
-] + platform_version_flags
-# Flags should be alphabetical by flag name to reduce merge conflifcts
diff --git a/build_config/protobuf_flags.scl b/build_config/protobuf_flags.scl
deleted file mode 100644
index 9c0c7967..00000000
--- a/build_config/protobuf_flags.scl
+++ /dev/null
@@ -1,39 +0,0 @@
-"""
-Build flag values for release config protobuf_flags.
-"""
-# Copyright (C) 2023 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Build system flag configuration for `lunch <product>-protobuf_flags-<variant>` builds
-#                                                      ^^^^^^^^^^^^^^
-# See go/build-system-flags
-#
-
-load("//build/make/core/release_config.scl", "value")
-
-################################################################################
-#
-# DO NOT EDIT THIS FILE
-#
-# Flag values should be changed in `trunk_staging.scl`, not here.  This file should
-# only be used where protobuf_flags differs from trunk_staging:
-# RELEASE_BUILD_FLAGS_IN_PROTOBUF is the only difference at this time.
-################################################################################
-values = [
-    # keep-sorted start numeric=yes
-    value("RELEASE_BUILD_FLAGS_IN_PROTOBUF", True),
-    # keep-sorted end
-]
-# Flags should be alphabetical by flag name to reduce merge conflifcts
diff --git a/build_config/protobuf_flags=proto b/build_config/protobuf_flags=proto
deleted file mode 100644
index 98b4583c..00000000
--- a/build_config/protobuf_flags=proto
+++ /dev/null
@@ -1 +0,0 @@
-Text to help presubmit DTRT.
diff --git a/build_config/trunk.scl b/build_config/trunk.scl
deleted file mode 100644
index 9240879b..00000000
--- a/build_config/trunk.scl
+++ /dev/null
@@ -1,65 +0,0 @@
-"""
-Build flag values for release config trunk.
-"""
-# Copyright (C) 2023 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Build system flag configuration for `lunch <product>-trunk-<variant>` builds
-#                                                      ^^^^^
-# See go/build-system-flags
-#
-
-load("//build/make/core/release_config.scl", "value")
-
-# Flags should be alphabetical by flag name to reduce merge conflifcts
-values = [
-    # keep-sorted start numeric=yes
-    value("RELEASE_ACONFIG_VALUE_SETS", "aconfig_value_set-aosp-trunk"),
-    value("RELEASE_AVF_ALLOW_PREINSTALLED_APPS", True),
-    value("RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT", True),
-    value("RELEASE_AVF_ENABLE_DICE_CHANGES", True),
-    value("RELEASE_AVF_ENABLE_LLPVM_CHANGES", True),
-    value("RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM", True),
-    value("RELEASE_AVF_ENABLE_REMOTE_ATTESTATION", True),
-    value("RELEASE_AVF_ENABLE_VENDOR_MODULES", True),
-    value("RELEASE_AVF_ENABLE_VIRT_CPUFREQ", True),
-    value("RELEASE_AVF_MICRODROID_KERNEL_VERSION", "android15_66"),
-    value("RELEASE_BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI", True),
-    value("RELEASE_BOARD_API_LEVEL", "202504"),
-    value("RELEASE_CRASHRECOVERY_MODULE", True),
-    value("RELEASE_CREATE_ACONFIG_STORAGE_FILE", True),
-    value("RELEASE_DEPRECATE_VNDK", True),
-    value("RELEASE_PACKAGE_FLAG_EMOJI_FONT_VERSION", "2.042"),
-    value("RELEASE_PACKAGE_HENTAIGANA_FONT", True),
-    value("RELEASE_PACKAGE_LIBANDROID_RUNTIME_PUNCH_HOLES", True),
-    value("RELEASE_PACKAGE_LIBSQLITE3", "3440300"),
-    value("RELEASE_PACKAGE_TZDATA_MODULE", "com.android.tzdata"),
-    value("RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK", True),
-    value("RELEASE_PLATFORM_SDK_EXTENSION_VERSION", "11"),
-    value("RELEASE_PLATFORM_SDK_VERSION", "34"),
-    value("RELEASE_PLATFORM_SECURITY_PATCH", "2024-01-05"),
-    value("RELEASE_PLATFORM_VERSION", "ZP1A"),
-    value("RELEASE_PLATFORM_VERSION_ALL_CODENAMES", "VanillaIceCream"),
-    value("RELEASE_PLATFORM_VERSION_ALL_PREVIEW_CODENAMES", "VanillaIceCream"),
-    value("RELEASE_PLATFORM_VERSION_CODENAME", "VanillaIceCream"),
-    value("RELEASE_PLATFORM_VERSION_LAST_STABLE", "14"),
-    value("RELEASE_PLATFORM_VNDK_VERSION", "35"),
-    value("RELEASE_REMOVE_LEGACY_EMOJI_FONT", True),
-    value("RELEASE_SELINUX_DATA_DATA_IGNORE", True),
-    value("RELEASE_SM_OPEN_DECLARED_PASSTHROUGH_HAL", True),
-    value("RELEASE_WRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES", True),
-    # keep-sorted end
-]
-# Flags should be alphabetical by flag name to reduce merge conflifcts
diff --git a/build_config/trunk_food.scl b/build_config/trunk_food.scl
deleted file mode 100644
index 54a296dc..00000000
--- a/build_config/trunk_food.scl
+++ /dev/null
@@ -1,36 +0,0 @@
-"""
-Build flag values for release config trunk_food.
-"""
-# Copyright (C) 2023 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Build system flag configuration for `lunch <product>-trunk_food-<variant>` builds
-#                                                      ^^^^^^^^^^
-# See go/build-system-flags
-#
-
-load("//build/make/core/release_config.scl", "value")
-
-################################################################################
-#
-# DO NOT EDIT THIS FILE
-#
-# Flag values should be changed in `trunk.scl`, not here.  This file should
-# only be used where trunk_food differs from trunk: RELEASE_ACONFIG_VALUE_SETS
-# is the only difference at this time.
-################################################################################
-values = [
-    value("RELEASE_ACONFIG_VALUE_SETS", "aconfig_value_set-aosp-trunk_food"),
-]
diff --git a/build_config/trunk_staging.scl b/build_config/trunk_staging.scl
index 1d134eb1..954bc93b 100644
--- a/build_config/trunk_staging.scl
+++ b/build_config/trunk_staging.scl
@@ -23,6 +23,7 @@ Build flag values for release config trunk_staging.
 
 load("//build/make/core/release_config.scl", "value")
 
+fail("trunk_staging now uses protobuf")
 # Flags should be alphabetical by flag name to reduce merge conflifcts
 values = [
     # keep-sorted start numeric=yes
@@ -39,6 +40,7 @@ values = [
     value("RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES", True),
     value("RELEASE_BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI", True),
     value("RELEASE_BOARD_API_LEVEL", "202504"),
+    value("RELEASE_BUILD_FLAGS_IN_PROTOBUF", True),
     value("RELEASE_CREATE_ACONFIG_STORAGE_FILE", True),
     value("RELEASE_DEPRECATE_VNDK", True),
     value("RELEASE_NDK_ABI_MONITORED", True),