Update staging branch aconfig flags and release configs.

- ap2a and trunk_staging using 2024-06 Release (ab/AP2A.240605.024)
- Deleting next/trunk_food/trunk build and aconfig flags


Ignore-AOSP-First: "AOSP Staging branch"
Change-Id: Ie697d7eb05cdbc017f6b96259fec72cf9a1ef01a

3 files changed, 0 insertions, 138 deletions

diff --git a/build_config/next.scl b/build_config/next.scl
deleted file mode 100644
index 3a6d930c..00000000
--- a/build_config/next.scl
+++ /dev/null
@@ -1,46 +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")
-
-# Flags should be alphabetical by flag name to reduce merge conflifcts
-values = [
-    # keep-sorted start numeric=yes
-    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_ANGLE_ON_SYSTEM", True),
-    value("RELEASE_BOARD_API_LEVEL", "202404"),
-    value("RELEASE_DEPRECATE_VNDK", True),
-    value("RELEASE_PLATFORM_SDK_EXTENSION_VERSION", "11"),
-    value("RELEASE_PLATFORM_SDK_VERSION", "34"),
-    value("RELEASE_PLATFORM_SECURITY_PATCH", "2024-05-05"),
-    value("RELEASE_PLATFORM_VERSION", "UP1A"),
-    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"),
-    # keep-sorted end
-]
-# Flags should be alphabetical by flag name to reduce merge conflifcts
diff --git a/build_config/trunk.scl b/build_config/trunk.scl
deleted file mode 100644
index aaea6094..00000000
--- a/build_config/trunk.scl
+++ /dev/null
@@ -1,56 +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_ANGLE_ON_SYSTEM", True),
-    value("RELEASE_AVATAR_PICKER_APP", True),
-    value("RELEASE_AVF_ALLOW_PREINSTALLED_APPS", True),
-    value("RELEASE_AVF_ENABLE_DICE_CHANGES", True),
-    value("RELEASE_BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI", True),
-    value("RELEASE_BOARD_API_LEVEL", "202404"),
-    value("RELEASE_CRASHRECOVERY_MODULE", True),
-    value("RELEASE_DEPRECATE_VNDK", True),
-    value("RELEASE_LARGE_SYSTEM_PROPERTY_NODE", True),
-    value("RELEASE_PACKAGE_HENTAIGANA_FONT", True),
-    value("RELEASE_PACKAGE_NFC_STACK", "com.android.nfcservices"),
-    value("RELEASE_PACKAGE_PROFILING_MODULE", True),
-    value("RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK", True),
-    value("RELEASE_PACKAGE_VIRTUAL_CAMERA", "virtual_camera"),
-    value("RELEASE_PLATFORM_SDK_EXTENSION_VERSION", "11"),
-    value("RELEASE_PLATFORM_SDK_VERSION", "34"),
-    value("RELEASE_PLATFORM_SECURITY_PATCH", "2024-05-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),
-    # 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"),
-]