summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build_config/next.scl86
-rw-r--r--build_config/protobuf_flags.scl39
-rw-r--r--build_config/protobuf_flags=proto0
-rw-r--r--build_config/trunk.scl91
-rw-r--r--build_config/trunk_food.scl36
-rw-r--r--flag_values/ap3a/RELEASE_ACONFIG_FLAG_DEFAULT_PERMISSION.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_AIDL_USE_UNFROZEN.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_AVATAR_PICKER_APP.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_AVF_ALLOW_PREINSTALLED_APPS.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_AVF_ENABLE_DICE_CHANGES.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_AVF_ENABLE_LLPVM_CHANGES.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_AVF_ENABLE_REMOTE_ATTESTATION.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_AVF_ENABLE_VENDOR_MODULES.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_AVF_ENABLE_VIRT_CPUFREQ.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_AVF_MICRODROID_KERNEL_VERSION.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_BOARD_API_LEVEL.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_KERNEL_BLUEJAY_DIR.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_KERNEL_BLUEJAY_VERSION.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_KERNEL_CHEETAH_DIR.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_KERNEL_CHEETAH_VERSION.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_KERNEL_FELIX_DIR.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_KERNEL_FELIX_VERSION.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_KERNEL_HUSKY_DIR.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_KERNEL_HUSKY_VERSION.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_KERNEL_LYNX_DIR.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_KERNEL_LYNX_VERSION.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_KERNEL_ORIOLE_DIR.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_KERNEL_ORIOLE_VERSION.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_KERNEL_PANTHER_DIR.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_KERNEL_PANTHER_VERSION.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_KERNEL_RAVEN_DIR.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_KERNEL_RAVEN_VERSION.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_KERNEL_RIPCURRENT_DIR.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_KERNEL_RIPCURRENT_VERSION.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_KERNEL_SHIBA_DIR.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_KERNEL_SHIBA_VERSION.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_KERNEL_TANGORPRO_DIR.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_KERNEL_TANGORPRO_VERSION.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_PACKAGE_FLAG_EMOJI_FONT_VERSION.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_PACKAGE_HENTAIGANA_FONT.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_PACKAGE_LIBANDROID_RUNTIME_PUNCH_HOLES.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_PACKAGE_LIBSQLITE3.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_PACKAGE_NFC_STACK.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_PACKAGE_PROFILING_MODULE.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_PACKAGE_VIRTUAL_CAMERA.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_PLATFORM_SECURITY_PATCH.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_PLATFORM_VERSION.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_PLATFORM_VERSION_ALL_CODENAMES.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_PLATFORM_VERSION_ALL_PREVIEW_CODENAMES.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_PLATFORM_VERSION_CODENAME.textproto4
-rw-r--r--flag_values/ap3a/RELEASE_REMOVE_LEGACY_EMOJI_FONT.textproto4
-rw-r--r--flag_values/trunk/RELEASE_AVATAR_PICKER_APP.textproto4
-rw-r--r--flag_values/trunk/RELEASE_AVF_ALLOW_PREINSTALLED_APPS.textproto4
-rw-r--r--flag_values/trunk/RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT.textproto4
-rw-r--r--flag_values/trunk/RELEASE_AVF_ENABLE_DICE_CHANGES.textproto4
-rw-r--r--flag_values/trunk/RELEASE_AVF_ENABLE_LLPVM_CHANGES.textproto4
-rw-r--r--flag_values/trunk/RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM.textproto4
-rw-r--r--flag_values/trunk/RELEASE_AVF_ENABLE_REMOTE_ATTESTATION.textproto4
-rw-r--r--flag_values/trunk/RELEASE_AVF_ENABLE_VENDOR_MODULES.textproto4
-rw-r--r--flag_values/trunk/RELEASE_AVF_ENABLE_VIRT_CPUFREQ.textproto4
-rw-r--r--flag_values/trunk/RELEASE_AVF_MICRODROID_KERNEL_VERSION.textproto4
-rw-r--r--flag_values/trunk/RELEASE_BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI.textproto4
-rw-r--r--flag_values/trunk/RELEASE_BOARD_API_LEVEL.textproto4
-rw-r--r--flag_values/trunk/RELEASE_CRASHRECOVERY_MODULE.textproto4
-rw-r--r--flag_values/trunk/RELEASE_CREATE_ACONFIG_STORAGE_FILE.textproto4
-rw-r--r--flag_values/trunk/RELEASE_KERNEL_BLUEJAY_DIR.textproto4
-rw-r--r--flag_values/trunk/RELEASE_KERNEL_BLUEJAY_VERSION.textproto4
-rw-r--r--flag_values/trunk/RELEASE_KERNEL_CHEETAH_DIR.textproto4
-rw-r--r--flag_values/trunk/RELEASE_KERNEL_CHEETAH_VERSION.textproto4
-rw-r--r--flag_values/trunk/RELEASE_KERNEL_FELIX_DIR.textproto4
-rw-r--r--flag_values/trunk/RELEASE_KERNEL_FELIX_VERSION.textproto4
-rw-r--r--flag_values/trunk/RELEASE_KERNEL_HUSKY_DIR.textproto4
-rw-r--r--flag_values/trunk/RELEASE_KERNEL_HUSKY_VERSION.textproto4
-rw-r--r--flag_values/trunk/RELEASE_KERNEL_LYNX_DIR.textproto4
-rw-r--r--flag_values/trunk/RELEASE_KERNEL_LYNX_VERSION.textproto4
-rw-r--r--flag_values/trunk/RELEASE_KERNEL_ORIOLE_DIR.textproto4
-rw-r--r--flag_values/trunk/RELEASE_KERNEL_ORIOLE_VERSION.textproto4
-rw-r--r--flag_values/trunk/RELEASE_KERNEL_PANTHER_DIR.textproto4
-rw-r--r--flag_values/trunk/RELEASE_KERNEL_PANTHER_VERSION.textproto4
-rw-r--r--flag_values/trunk/RELEASE_KERNEL_RAVEN_DIR.textproto4
-rw-r--r--flag_values/trunk/RELEASE_KERNEL_RAVEN_VERSION.textproto4
-rw-r--r--flag_values/trunk/RELEASE_KERNEL_RIPCURRENT_DIR.textproto4
-rw-r--r--flag_values/trunk/RELEASE_KERNEL_RIPCURRENT_VERSION.textproto4
-rw-r--r--flag_values/trunk/RELEASE_KERNEL_SHIBA_DIR.textproto4
-rw-r--r--flag_values/trunk/RELEASE_KERNEL_SHIBA_VERSION.textproto4
-rw-r--r--flag_values/trunk/RELEASE_KERNEL_TANGORPRO_DIR.textproto4
-rw-r--r--flag_values/trunk/RELEASE_KERNEL_TANGORPRO_VERSION.textproto4
-rw-r--r--flag_values/trunk/RELEASE_LARGE_SYSTEM_PROPERTY_NODE.textproto4
-rw-r--r--flag_values/trunk/RELEASE_PACKAGE_FLAG_EMOJI_FONT_VERSION.textproto4
-rw-r--r--flag_values/trunk/RELEASE_PACKAGE_HENTAIGANA_FONT.textproto4
-rw-r--r--flag_values/trunk/RELEASE_PACKAGE_LIBANDROID_RUNTIME_PUNCH_HOLES.textproto4
-rw-r--r--flag_values/trunk/RELEASE_PACKAGE_LIBSQLITE3.textproto4
-rw-r--r--flag_values/trunk/RELEASE_PACKAGE_NFC_STACK.textproto4
-rw-r--r--flag_values/trunk/RELEASE_PACKAGE_PROFILING_MODULE.textproto4
-rw-r--r--flag_values/trunk/RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK.textproto4
-rw-r--r--flag_values/trunk/RELEASE_PACKAGE_VIRTUAL_CAMERA.textproto4
-rw-r--r--flag_values/trunk/RELEASE_PLATFORM_SECURITY_PATCH.textproto4
-rw-r--r--flag_values/trunk/RELEASE_REMOVE_LEGACY_EMOJI_FONT.textproto4
-rw-r--r--flag_values/trunk/RELEASE_SELINUX_DATA_DATA_IGNORE.textproto4
-rw-r--r--flag_values/trunk/RELEASE_SM_OPEN_DECLARED_PASSTHROUGH_HAL.textproto4
-rw-r--r--flag_values/trunk/RELEASE_WRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES.textproto4
-rw-r--r--flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT_DIR.textproto2
-rw-r--r--flag_values/trunk_staging/RELEASE_KERNEL_SHIBA_DIR.textproto2
-rw-r--r--release_config_map.mk12
-rw-r--r--release_configs/ap3a.textproto1
-rw-r--r--release_configs/protobuf_flags.textproto2
-rw-r--r--release_configs/trunk.textproto1
-rw-r--r--release_configs/trunk_food.textproto3
111 files changed, 8 insertions, 663 deletions
diff --git a/build_config/next.scl b/build_config/next.scl
deleted file mode 100644
index 7f99c87d..00000000
--- a/build_config/next.scl
+++ /dev/null
@@ -1,86 +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_AVATAR_PICKER_APP", True),
- 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_BOARD_API_LEVEL", "202404"),
- value("RELEASE_DEPRECATE_VNDK", True),
- value("RELEASE_KERNEL_BLUEJAY_DIR", "device/google/bluejay-kernels/5.10/24Q3-11765480"),
- value("RELEASE_KERNEL_BLUEJAY_VERSION", "5.10"),
- value("RELEASE_KERNEL_CHEETAH_DIR", "device/google/pantah-kernels/5.10/24Q3-11765480"),
- value("RELEASE_KERNEL_CHEETAH_VERSION", "5.10"),
- value("RELEASE_KERNEL_FELIX_DIR", "device/google/felix-kernels/5.10/24Q3-11765480"),
- value("RELEASE_KERNEL_FELIX_VERSION", "5.10"),
- value("RELEASE_KERNEL_HUSKY_DIR", "device/google/shusky-kernels/5.15/24Q3-11791196"),
- value("RELEASE_KERNEL_HUSKY_VERSION", "5.15"),
- value("RELEASE_KERNEL_LYNX_DIR", "device/google/lynx-kernels/5.10/24Q3-11765480"),
- value("RELEASE_KERNEL_LYNX_VERSION", "5.10"),
- value("RELEASE_KERNEL_ORIOLE_DIR", "device/google/raviole-kernels/5.10/24Q3-11765480"),
- value("RELEASE_KERNEL_ORIOLE_VERSION", "5.10"),
- value("RELEASE_KERNEL_PANTHER_DIR", "device/google/pantah-kernels/5.10/24Q3-11765480"),
- value("RELEASE_KERNEL_PANTHER_VERSION", "5.10"),
- value("RELEASE_KERNEL_RAVEN_DIR", "device/google/raviole-kernels/5.10/24Q3-11765480"),
- value("RELEASE_KERNEL_RAVEN_VERSION", "5.10"),
- value("RELEASE_KERNEL_RIPCURRENT_DIR", "device/google/shusky-kernels/5.15/24Q3-11791196"),
- value("RELEASE_KERNEL_RIPCURRENT_VERSION", "5.15"),
- value("RELEASE_KERNEL_SHIBA_DIR", "device/google/shusky-kernels/5.15/24Q3-11791196"),
- value("RELEASE_KERNEL_SHIBA_VERSION", "5.15"),
- value("RELEASE_KERNEL_TANGORPRO_DIR", "device/google/tangorpro-kernels/5.10/24Q3-11765480"),
- value("RELEASE_KERNEL_TANGORPRO_VERSION", "5.10"),
- 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_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", "12"),
- value("RELEASE_PLATFORM_SDK_VERSION", "34"),
- value("RELEASE_PLATFORM_SECURITY_PATCH", "2024-06-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"),
- 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/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 e69de29b..00000000
--- a/build_config/protobuf_flags=proto
+++ /dev/null
diff --git a/build_config/trunk.scl b/build_config/trunk.scl
deleted file mode 100644
index f62b58a4..00000000
--- a/build_config/trunk.scl
+++ /dev/null
@@ -1,91 +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_AVATAR_PICKER_APP", True),
- 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_KERNEL_BLUEJAY_DIR", "device/google/bluejay-kernels/5.10/trunk-11768877"),
- value("RELEASE_KERNEL_BLUEJAY_VERSION", "5.10"),
- value("RELEASE_KERNEL_CHEETAH_DIR", "device/google/pantah-kernels/5.10/trunk-11768877"),
- value("RELEASE_KERNEL_CHEETAH_VERSION", "5.10"),
- value("RELEASE_KERNEL_FELIX_DIR", "device/google/felix-kernels/5.10/trunk-11768877"),
- value("RELEASE_KERNEL_FELIX_VERSION", "5.10"),
- value("RELEASE_KERNEL_HUSKY_DIR", "device/google/shusky-kernels/5.15/trunk-11782637"),
- value("RELEASE_KERNEL_HUSKY_VERSION", "5.15"),
- value("RELEASE_KERNEL_LYNX_DIR", "device/google/lynx-kernels/5.10/trunk-11768877"),
- value("RELEASE_KERNEL_LYNX_VERSION", "5.10"),
- value("RELEASE_KERNEL_ORIOLE_DIR", "device/google/raviole-kernels/5.10/trunk-11768877"),
- value("RELEASE_KERNEL_ORIOLE_VERSION", "5.10"),
- value("RELEASE_KERNEL_PANTHER_DIR", "device/google/pantah-kernels/5.10/trunk-11768877"),
- value("RELEASE_KERNEL_PANTHER_VERSION", "5.10"),
- value("RELEASE_KERNEL_RAVEN_DIR", "device/google/raviole-kernels/5.10/trunk-11768877"),
- value("RELEASE_KERNEL_RAVEN_VERSION", "5.10"),
- value("RELEASE_KERNEL_RIPCURRENT_DIR", "device/google/shusky-kernels/5.15/trunk-11782637"),
- value("RELEASE_KERNEL_RIPCURRENT_VERSION", "5.15"),
- value("RELEASE_KERNEL_SHIBA_DIR", "device/google/shusky-kernels/5.15/trunk-11782637"),
- value("RELEASE_KERNEL_SHIBA_VERSION", "5.15"),
- value("RELEASE_KERNEL_TANGORPRO_DIR", "device/google/tangorpro-kernels/5.10/trunk-11768877"),
- value("RELEASE_KERNEL_TANGORPRO_VERSION", "5.10"),
- value("RELEASE_LARGE_SYSTEM_PROPERTY_NODE", 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_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", "12"),
- value("RELEASE_PLATFORM_SDK_VERSION", "34"),
- value("RELEASE_PLATFORM_SECURITY_PATCH", "2024-06-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/flag_values/ap3a/RELEASE_ACONFIG_FLAG_DEFAULT_PERMISSION.textproto b/flag_values/ap3a/RELEASE_ACONFIG_FLAG_DEFAULT_PERMISSION.textproto
deleted file mode 100644
index aeffb821..00000000
--- a/flag_values/ap3a/RELEASE_ACONFIG_FLAG_DEFAULT_PERMISSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_ACONFIG_FLAG_DEFAULT_PERMISSION"
-value: {
- string_value: "READ_ONLY"
-}
diff --git a/flag_values/ap3a/RELEASE_AIDL_USE_UNFROZEN.textproto b/flag_values/ap3a/RELEASE_AIDL_USE_UNFROZEN.textproto
deleted file mode 100644
index a4243df1..00000000
--- a/flag_values/ap3a/RELEASE_AIDL_USE_UNFROZEN.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AIDL_USE_UNFROZEN"
-value: {
- bool_value: false
-}
diff --git a/flag_values/ap3a/RELEASE_AVATAR_PICKER_APP.textproto b/flag_values/ap3a/RELEASE_AVATAR_PICKER_APP.textproto
deleted file mode 100644
index a6c93f4d..00000000
--- a/flag_values/ap3a/RELEASE_AVATAR_PICKER_APP.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVATAR_PICKER_APP"
-value: {
- bool_value: true
-}
diff --git a/flag_values/ap3a/RELEASE_AVF_ALLOW_PREINSTALLED_APPS.textproto b/flag_values/ap3a/RELEASE_AVF_ALLOW_PREINSTALLED_APPS.textproto
deleted file mode 100644
index c063a168..00000000
--- a/flag_values/ap3a/RELEASE_AVF_ALLOW_PREINSTALLED_APPS.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ALLOW_PREINSTALLED_APPS"
-value: {
- bool_value: true
-}
diff --git a/flag_values/ap3a/RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT.textproto b/flag_values/ap3a/RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT.textproto
deleted file mode 100644
index 582c6fbb..00000000
--- a/flag_values/ap3a/RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT"
-value: {
- bool_value: true
-}
diff --git a/flag_values/ap3a/RELEASE_AVF_ENABLE_DICE_CHANGES.textproto b/flag_values/ap3a/RELEASE_AVF_ENABLE_DICE_CHANGES.textproto
deleted file mode 100644
index 03d69f33..00000000
--- a/flag_values/ap3a/RELEASE_AVF_ENABLE_DICE_CHANGES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_DICE_CHANGES"
-value: {
- bool_value: true
-}
diff --git a/flag_values/ap3a/RELEASE_AVF_ENABLE_LLPVM_CHANGES.textproto b/flag_values/ap3a/RELEASE_AVF_ENABLE_LLPVM_CHANGES.textproto
deleted file mode 100644
index d4705ded..00000000
--- a/flag_values/ap3a/RELEASE_AVF_ENABLE_LLPVM_CHANGES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_LLPVM_CHANGES"
-value: {
- bool_value: true
-}
diff --git a/flag_values/ap3a/RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM.textproto b/flag_values/ap3a/RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM.textproto
deleted file mode 100644
index 2f54f752..00000000
--- a/flag_values/ap3a/RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM"
-value: {
- bool_value: true
-}
diff --git a/flag_values/ap3a/RELEASE_AVF_ENABLE_REMOTE_ATTESTATION.textproto b/flag_values/ap3a/RELEASE_AVF_ENABLE_REMOTE_ATTESTATION.textproto
deleted file mode 100644
index b24d9b35..00000000
--- a/flag_values/ap3a/RELEASE_AVF_ENABLE_REMOTE_ATTESTATION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_REMOTE_ATTESTATION"
-value: {
- bool_value: true
-}
diff --git a/flag_values/ap3a/RELEASE_AVF_ENABLE_VENDOR_MODULES.textproto b/flag_values/ap3a/RELEASE_AVF_ENABLE_VENDOR_MODULES.textproto
deleted file mode 100644
index 15bbdcbd..00000000
--- a/flag_values/ap3a/RELEASE_AVF_ENABLE_VENDOR_MODULES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_VENDOR_MODULES"
-value: {
- bool_value: true
-}
diff --git a/flag_values/ap3a/RELEASE_AVF_ENABLE_VIRT_CPUFREQ.textproto b/flag_values/ap3a/RELEASE_AVF_ENABLE_VIRT_CPUFREQ.textproto
deleted file mode 100644
index e157895e..00000000
--- a/flag_values/ap3a/RELEASE_AVF_ENABLE_VIRT_CPUFREQ.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_VIRT_CPUFREQ"
-value: {
- bool_value: true
-}
diff --git a/flag_values/ap3a/RELEASE_AVF_MICRODROID_KERNEL_VERSION.textproto b/flag_values/ap3a/RELEASE_AVF_MICRODROID_KERNEL_VERSION.textproto
deleted file mode 100644
index b6e3b2c8..00000000
--- a/flag_values/ap3a/RELEASE_AVF_MICRODROID_KERNEL_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_MICRODROID_KERNEL_VERSION"
-value: {
- string_value: "android15_66"
-}
diff --git a/flag_values/ap3a/RELEASE_BOARD_API_LEVEL.textproto b/flag_values/ap3a/RELEASE_BOARD_API_LEVEL.textproto
deleted file mode 100644
index 5b9e36f2..00000000
--- a/flag_values/ap3a/RELEASE_BOARD_API_LEVEL.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_BOARD_API_LEVEL"
-value: {
- string_value: "202404"
-}
diff --git a/flag_values/ap3a/RELEASE_KERNEL_BLUEJAY_DIR.textproto b/flag_values/ap3a/RELEASE_KERNEL_BLUEJAY_DIR.textproto
deleted file mode 100644
index d030e6a3..00000000
--- a/flag_values/ap3a/RELEASE_KERNEL_BLUEJAY_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_BLUEJAY_DIR"
-value: {
- string_value: "device/google/bluejay-kernels/5.10/24Q3-11765480"
-}
diff --git a/flag_values/ap3a/RELEASE_KERNEL_BLUEJAY_VERSION.textproto b/flag_values/ap3a/RELEASE_KERNEL_BLUEJAY_VERSION.textproto
deleted file mode 100644
index 07f19179..00000000
--- a/flag_values/ap3a/RELEASE_KERNEL_BLUEJAY_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_BLUEJAY_VERSION"
-value: {
- string_value: "5.10"
-}
diff --git a/flag_values/ap3a/RELEASE_KERNEL_CHEETAH_DIR.textproto b/flag_values/ap3a/RELEASE_KERNEL_CHEETAH_DIR.textproto
deleted file mode 100644
index 4b0c09f6..00000000
--- a/flag_values/ap3a/RELEASE_KERNEL_CHEETAH_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_CHEETAH_DIR"
-value: {
- string_value: "device/google/pantah-kernels/5.10/24Q3-11765480"
-}
diff --git a/flag_values/ap3a/RELEASE_KERNEL_CHEETAH_VERSION.textproto b/flag_values/ap3a/RELEASE_KERNEL_CHEETAH_VERSION.textproto
deleted file mode 100644
index fcb91b8f..00000000
--- a/flag_values/ap3a/RELEASE_KERNEL_CHEETAH_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_CHEETAH_VERSION"
-value: {
- string_value: "5.10"
-}
diff --git a/flag_values/ap3a/RELEASE_KERNEL_FELIX_DIR.textproto b/flag_values/ap3a/RELEASE_KERNEL_FELIX_DIR.textproto
deleted file mode 100644
index 4c4eef5f..00000000
--- a/flag_values/ap3a/RELEASE_KERNEL_FELIX_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_FELIX_DIR"
-value: {
- string_value: "device/google/felix-kernels/5.10/24Q3-11765480"
-}
diff --git a/flag_values/ap3a/RELEASE_KERNEL_FELIX_VERSION.textproto b/flag_values/ap3a/RELEASE_KERNEL_FELIX_VERSION.textproto
deleted file mode 100644
index 05ffa7fb..00000000
--- a/flag_values/ap3a/RELEASE_KERNEL_FELIX_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_FELIX_VERSION"
-value: {
- string_value: "5.10"
-}
diff --git a/flag_values/ap3a/RELEASE_KERNEL_HUSKY_DIR.textproto b/flag_values/ap3a/RELEASE_KERNEL_HUSKY_DIR.textproto
deleted file mode 100644
index ad24d1f0..00000000
--- a/flag_values/ap3a/RELEASE_KERNEL_HUSKY_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_HUSKY_DIR"
-value: {
- string_value: "device/google/shusky-kernels/5.15/24Q3-11791196"
-}
diff --git a/flag_values/ap3a/RELEASE_KERNEL_HUSKY_VERSION.textproto b/flag_values/ap3a/RELEASE_KERNEL_HUSKY_VERSION.textproto
deleted file mode 100644
index 19a08ff6..00000000
--- a/flag_values/ap3a/RELEASE_KERNEL_HUSKY_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_HUSKY_VERSION"
-value: {
- string_value: "5.15"
-}
diff --git a/flag_values/ap3a/RELEASE_KERNEL_LYNX_DIR.textproto b/flag_values/ap3a/RELEASE_KERNEL_LYNX_DIR.textproto
deleted file mode 100644
index 3d756fa6..00000000
--- a/flag_values/ap3a/RELEASE_KERNEL_LYNX_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_LYNX_DIR"
-value: {
- string_value: "device/google/lynx-kernels/5.10/24Q3-11765480"
-}
diff --git a/flag_values/ap3a/RELEASE_KERNEL_LYNX_VERSION.textproto b/flag_values/ap3a/RELEASE_KERNEL_LYNX_VERSION.textproto
deleted file mode 100644
index 3e2d971a..00000000
--- a/flag_values/ap3a/RELEASE_KERNEL_LYNX_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_LYNX_VERSION"
-value: {
- string_value: "5.10"
-}
diff --git a/flag_values/ap3a/RELEASE_KERNEL_ORIOLE_DIR.textproto b/flag_values/ap3a/RELEASE_KERNEL_ORIOLE_DIR.textproto
deleted file mode 100644
index 0e64ddc2..00000000
--- a/flag_values/ap3a/RELEASE_KERNEL_ORIOLE_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_ORIOLE_DIR"
-value: {
- string_value: "device/google/raviole-kernels/5.10/24Q3-11765480"
-}
diff --git a/flag_values/ap3a/RELEASE_KERNEL_ORIOLE_VERSION.textproto b/flag_values/ap3a/RELEASE_KERNEL_ORIOLE_VERSION.textproto
deleted file mode 100644
index 10cebd28..00000000
--- a/flag_values/ap3a/RELEASE_KERNEL_ORIOLE_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_ORIOLE_VERSION"
-value: {
- string_value: "5.10"
-}
diff --git a/flag_values/ap3a/RELEASE_KERNEL_PANTHER_DIR.textproto b/flag_values/ap3a/RELEASE_KERNEL_PANTHER_DIR.textproto
deleted file mode 100644
index f56ecd64..00000000
--- a/flag_values/ap3a/RELEASE_KERNEL_PANTHER_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_PANTHER_DIR"
-value: {
- string_value: "device/google/pantah-kernels/5.10/24Q3-11765480"
-}
diff --git a/flag_values/ap3a/RELEASE_KERNEL_PANTHER_VERSION.textproto b/flag_values/ap3a/RELEASE_KERNEL_PANTHER_VERSION.textproto
deleted file mode 100644
index 7b0203f4..00000000
--- a/flag_values/ap3a/RELEASE_KERNEL_PANTHER_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_PANTHER_VERSION"
-value: {
- string_value: "5.10"
-}
diff --git a/flag_values/ap3a/RELEASE_KERNEL_RAVEN_DIR.textproto b/flag_values/ap3a/RELEASE_KERNEL_RAVEN_DIR.textproto
deleted file mode 100644
index 049d6d4d..00000000
--- a/flag_values/ap3a/RELEASE_KERNEL_RAVEN_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_RAVEN_DIR"
-value: {
- string_value: "device/google/raviole-kernels/5.10/24Q3-11765480"
-}
diff --git a/flag_values/ap3a/RELEASE_KERNEL_RAVEN_VERSION.textproto b/flag_values/ap3a/RELEASE_KERNEL_RAVEN_VERSION.textproto
deleted file mode 100644
index 89c747da..00000000
--- a/flag_values/ap3a/RELEASE_KERNEL_RAVEN_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_RAVEN_VERSION"
-value: {
- string_value: "5.10"
-}
diff --git a/flag_values/ap3a/RELEASE_KERNEL_RIPCURRENT_DIR.textproto b/flag_values/ap3a/RELEASE_KERNEL_RIPCURRENT_DIR.textproto
deleted file mode 100644
index d5ea2d89..00000000
--- a/flag_values/ap3a/RELEASE_KERNEL_RIPCURRENT_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_RIPCURRENT_DIR"
-value: {
- string_value: "device/google/shusky-kernels/5.15/24Q3-11791196"
-}
diff --git a/flag_values/ap3a/RELEASE_KERNEL_RIPCURRENT_VERSION.textproto b/flag_values/ap3a/RELEASE_KERNEL_RIPCURRENT_VERSION.textproto
deleted file mode 100644
index 9c3a2698..00000000
--- a/flag_values/ap3a/RELEASE_KERNEL_RIPCURRENT_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_RIPCURRENT_VERSION"
-value: {
- string_value: "5.15"
-}
diff --git a/flag_values/ap3a/RELEASE_KERNEL_SHIBA_DIR.textproto b/flag_values/ap3a/RELEASE_KERNEL_SHIBA_DIR.textproto
deleted file mode 100644
index eb16739e..00000000
--- a/flag_values/ap3a/RELEASE_KERNEL_SHIBA_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_SHIBA_DIR"
-value: {
- string_value: "device/google/shusky-kernels/5.15/24Q3-11791196"
-}
diff --git a/flag_values/ap3a/RELEASE_KERNEL_SHIBA_VERSION.textproto b/flag_values/ap3a/RELEASE_KERNEL_SHIBA_VERSION.textproto
deleted file mode 100644
index 9ef0f38c..00000000
--- a/flag_values/ap3a/RELEASE_KERNEL_SHIBA_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_SHIBA_VERSION"
-value: {
- string_value: "5.15"
-}
diff --git a/flag_values/ap3a/RELEASE_KERNEL_TANGORPRO_DIR.textproto b/flag_values/ap3a/RELEASE_KERNEL_TANGORPRO_DIR.textproto
deleted file mode 100644
index 61b992ce..00000000
--- a/flag_values/ap3a/RELEASE_KERNEL_TANGORPRO_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_TANGORPRO_DIR"
-value: {
- string_value: "device/google/tangorpro-kernels/5.10/24Q3-11765480"
-}
diff --git a/flag_values/ap3a/RELEASE_KERNEL_TANGORPRO_VERSION.textproto b/flag_values/ap3a/RELEASE_KERNEL_TANGORPRO_VERSION.textproto
deleted file mode 100644
index 2b8cf8bf..00000000
--- a/flag_values/ap3a/RELEASE_KERNEL_TANGORPRO_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_TANGORPRO_VERSION"
-value: {
- string_value: "5.10"
-}
diff --git a/flag_values/ap3a/RELEASE_PACKAGE_FLAG_EMOJI_FONT_VERSION.textproto b/flag_values/ap3a/RELEASE_PACKAGE_FLAG_EMOJI_FONT_VERSION.textproto
deleted file mode 100644
index 8c8a8ebc..00000000
--- a/flag_values/ap3a/RELEASE_PACKAGE_FLAG_EMOJI_FONT_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_FLAG_EMOJI_FONT_VERSION"
-value: {
- string_value: "2.042"
-}
diff --git a/flag_values/ap3a/RELEASE_PACKAGE_HENTAIGANA_FONT.textproto b/flag_values/ap3a/RELEASE_PACKAGE_HENTAIGANA_FONT.textproto
deleted file mode 100644
index 22219363..00000000
--- a/flag_values/ap3a/RELEASE_PACKAGE_HENTAIGANA_FONT.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_HENTAIGANA_FONT"
-value: {
- bool_value: true
-}
diff --git a/flag_values/ap3a/RELEASE_PACKAGE_LIBANDROID_RUNTIME_PUNCH_HOLES.textproto b/flag_values/ap3a/RELEASE_PACKAGE_LIBANDROID_RUNTIME_PUNCH_HOLES.textproto
deleted file mode 100644
index 8aaf8da7..00000000
--- a/flag_values/ap3a/RELEASE_PACKAGE_LIBANDROID_RUNTIME_PUNCH_HOLES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_LIBANDROID_RUNTIME_PUNCH_HOLES"
-value: {
- bool_value: true
-}
diff --git a/flag_values/ap3a/RELEASE_PACKAGE_LIBSQLITE3.textproto b/flag_values/ap3a/RELEASE_PACKAGE_LIBSQLITE3.textproto
deleted file mode 100644
index bb903b8d..00000000
--- a/flag_values/ap3a/RELEASE_PACKAGE_LIBSQLITE3.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_LIBSQLITE3"
-value: {
- string_value: "3440300"
-}
diff --git a/flag_values/ap3a/RELEASE_PACKAGE_NFC_STACK.textproto b/flag_values/ap3a/RELEASE_PACKAGE_NFC_STACK.textproto
deleted file mode 100644
index f0b126a9..00000000
--- a/flag_values/ap3a/RELEASE_PACKAGE_NFC_STACK.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_NFC_STACK"
-value: {
- string_value: "com.android.nfcservices"
-}
diff --git a/flag_values/ap3a/RELEASE_PACKAGE_PROFILING_MODULE.textproto b/flag_values/ap3a/RELEASE_PACKAGE_PROFILING_MODULE.textproto
deleted file mode 100644
index fe523590..00000000
--- a/flag_values/ap3a/RELEASE_PACKAGE_PROFILING_MODULE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_PROFILING_MODULE"
-value: {
- bool_value: true
-}
diff --git a/flag_values/ap3a/RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK.textproto b/flag_values/ap3a/RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK.textproto
deleted file mode 100644
index 6bfbf143..00000000
--- a/flag_values/ap3a/RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK"
-value: {
- bool_value: true
-}
diff --git a/flag_values/ap3a/RELEASE_PACKAGE_VIRTUAL_CAMERA.textproto b/flag_values/ap3a/RELEASE_PACKAGE_VIRTUAL_CAMERA.textproto
deleted file mode 100644
index 54fe1061..00000000
--- a/flag_values/ap3a/RELEASE_PACKAGE_VIRTUAL_CAMERA.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_VIRTUAL_CAMERA"
-value: {
- string_value: "virtual_camera"
-}
diff --git a/flag_values/ap3a/RELEASE_PLATFORM_SECURITY_PATCH.textproto b/flag_values/ap3a/RELEASE_PLATFORM_SECURITY_PATCH.textproto
deleted file mode 100644
index 75f8319e..00000000
--- a/flag_values/ap3a/RELEASE_PLATFORM_SECURITY_PATCH.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PLATFORM_SECURITY_PATCH"
-value: {
- string_value: "2024-06-05"
-}
diff --git a/flag_values/ap3a/RELEASE_PLATFORM_VERSION.textproto b/flag_values/ap3a/RELEASE_PLATFORM_VERSION.textproto
deleted file mode 100644
index 7ac660e4..00000000
--- a/flag_values/ap3a/RELEASE_PLATFORM_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PLATFORM_VERSION"
-value: {
- string_value: "UP1A"
-}
diff --git a/flag_values/ap3a/RELEASE_PLATFORM_VERSION_ALL_CODENAMES.textproto b/flag_values/ap3a/RELEASE_PLATFORM_VERSION_ALL_CODENAMES.textproto
deleted file mode 100644
index ee5624ef..00000000
--- a/flag_values/ap3a/RELEASE_PLATFORM_VERSION_ALL_CODENAMES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PLATFORM_VERSION_ALL_CODENAMES"
-value: {
- string_value: "REL"
-}
diff --git a/flag_values/ap3a/RELEASE_PLATFORM_VERSION_ALL_PREVIEW_CODENAMES.textproto b/flag_values/ap3a/RELEASE_PLATFORM_VERSION_ALL_PREVIEW_CODENAMES.textproto
deleted file mode 100644
index 8b260e7a..00000000
--- a/flag_values/ap3a/RELEASE_PLATFORM_VERSION_ALL_PREVIEW_CODENAMES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PLATFORM_VERSION_ALL_PREVIEW_CODENAMES"
-value: {
- string_value: "REL,VanillaIceCream"
-}
diff --git a/flag_values/ap3a/RELEASE_PLATFORM_VERSION_CODENAME.textproto b/flag_values/ap3a/RELEASE_PLATFORM_VERSION_CODENAME.textproto
deleted file mode 100644
index 6bba546a..00000000
--- a/flag_values/ap3a/RELEASE_PLATFORM_VERSION_CODENAME.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PLATFORM_VERSION_CODENAME"
-value: {
- string_value: "REL"
-}
diff --git a/flag_values/ap3a/RELEASE_REMOVE_LEGACY_EMOJI_FONT.textproto b/flag_values/ap3a/RELEASE_REMOVE_LEGACY_EMOJI_FONT.textproto
deleted file mode 100644
index 7412a017..00000000
--- a/flag_values/ap3a/RELEASE_REMOVE_LEGACY_EMOJI_FONT.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_REMOVE_LEGACY_EMOJI_FONT"
-value: {
- string_value: "True"
-}
diff --git a/flag_values/trunk/RELEASE_AVATAR_PICKER_APP.textproto b/flag_values/trunk/RELEASE_AVATAR_PICKER_APP.textproto
deleted file mode 100644
index a6c93f4d..00000000
--- a/flag_values/trunk/RELEASE_AVATAR_PICKER_APP.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVATAR_PICKER_APP"
-value: {
- bool_value: true
-}
diff --git a/flag_values/trunk/RELEASE_AVF_ALLOW_PREINSTALLED_APPS.textproto b/flag_values/trunk/RELEASE_AVF_ALLOW_PREINSTALLED_APPS.textproto
deleted file mode 100644
index c063a168..00000000
--- a/flag_values/trunk/RELEASE_AVF_ALLOW_PREINSTALLED_APPS.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ALLOW_PREINSTALLED_APPS"
-value: {
- bool_value: true
-}
diff --git a/flag_values/trunk/RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT.textproto b/flag_values/trunk/RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT.textproto
deleted file mode 100644
index 582c6fbb..00000000
--- a/flag_values/trunk/RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT"
-value: {
- bool_value: true
-}
diff --git a/flag_values/trunk/RELEASE_AVF_ENABLE_DICE_CHANGES.textproto b/flag_values/trunk/RELEASE_AVF_ENABLE_DICE_CHANGES.textproto
deleted file mode 100644
index 03d69f33..00000000
--- a/flag_values/trunk/RELEASE_AVF_ENABLE_DICE_CHANGES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_DICE_CHANGES"
-value: {
- bool_value: true
-}
diff --git a/flag_values/trunk/RELEASE_AVF_ENABLE_LLPVM_CHANGES.textproto b/flag_values/trunk/RELEASE_AVF_ENABLE_LLPVM_CHANGES.textproto
deleted file mode 100644
index d4705ded..00000000
--- a/flag_values/trunk/RELEASE_AVF_ENABLE_LLPVM_CHANGES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_LLPVM_CHANGES"
-value: {
- bool_value: true
-}
diff --git a/flag_values/trunk/RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM.textproto b/flag_values/trunk/RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM.textproto
deleted file mode 100644
index 2f54f752..00000000
--- a/flag_values/trunk/RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM"
-value: {
- bool_value: true
-}
diff --git a/flag_values/trunk/RELEASE_AVF_ENABLE_REMOTE_ATTESTATION.textproto b/flag_values/trunk/RELEASE_AVF_ENABLE_REMOTE_ATTESTATION.textproto
deleted file mode 100644
index b24d9b35..00000000
--- a/flag_values/trunk/RELEASE_AVF_ENABLE_REMOTE_ATTESTATION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_REMOTE_ATTESTATION"
-value: {
- bool_value: true
-}
diff --git a/flag_values/trunk/RELEASE_AVF_ENABLE_VENDOR_MODULES.textproto b/flag_values/trunk/RELEASE_AVF_ENABLE_VENDOR_MODULES.textproto
deleted file mode 100644
index 15bbdcbd..00000000
--- a/flag_values/trunk/RELEASE_AVF_ENABLE_VENDOR_MODULES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_VENDOR_MODULES"
-value: {
- bool_value: true
-}
diff --git a/flag_values/trunk/RELEASE_AVF_ENABLE_VIRT_CPUFREQ.textproto b/flag_values/trunk/RELEASE_AVF_ENABLE_VIRT_CPUFREQ.textproto
deleted file mode 100644
index e157895e..00000000
--- a/flag_values/trunk/RELEASE_AVF_ENABLE_VIRT_CPUFREQ.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_VIRT_CPUFREQ"
-value: {
- bool_value: true
-}
diff --git a/flag_values/trunk/RELEASE_AVF_MICRODROID_KERNEL_VERSION.textproto b/flag_values/trunk/RELEASE_AVF_MICRODROID_KERNEL_VERSION.textproto
deleted file mode 100644
index b6e3b2c8..00000000
--- a/flag_values/trunk/RELEASE_AVF_MICRODROID_KERNEL_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_MICRODROID_KERNEL_VERSION"
-value: {
- string_value: "android15_66"
-}
diff --git a/flag_values/trunk/RELEASE_BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI.textproto b/flag_values/trunk/RELEASE_BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI.textproto
deleted file mode 100644
index acf8a88d..00000000
--- a/flag_values/trunk/RELEASE_BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI"
-value: {
- bool_value: true
-}
diff --git a/flag_values/trunk/RELEASE_BOARD_API_LEVEL.textproto b/flag_values/trunk/RELEASE_BOARD_API_LEVEL.textproto
deleted file mode 100644
index c1e67e53..00000000
--- a/flag_values/trunk/RELEASE_BOARD_API_LEVEL.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_BOARD_API_LEVEL"
-value: {
- string_value: "202504"
-}
diff --git a/flag_values/trunk/RELEASE_CRASHRECOVERY_MODULE.textproto b/flag_values/trunk/RELEASE_CRASHRECOVERY_MODULE.textproto
deleted file mode 100644
index eba6547d..00000000
--- a/flag_values/trunk/RELEASE_CRASHRECOVERY_MODULE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_CRASHRECOVERY_MODULE"
-value: {
- bool_value: true
-}
diff --git a/flag_values/trunk/RELEASE_CREATE_ACONFIG_STORAGE_FILE.textproto b/flag_values/trunk/RELEASE_CREATE_ACONFIG_STORAGE_FILE.textproto
deleted file mode 100644
index f6e24469..00000000
--- a/flag_values/trunk/RELEASE_CREATE_ACONFIG_STORAGE_FILE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_CREATE_ACONFIG_STORAGE_FILE"
-value: {
- bool_value: true
-}
diff --git a/flag_values/trunk/RELEASE_KERNEL_BLUEJAY_DIR.textproto b/flag_values/trunk/RELEASE_KERNEL_BLUEJAY_DIR.textproto
deleted file mode 100644
index 6caa7642..00000000
--- a/flag_values/trunk/RELEASE_KERNEL_BLUEJAY_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_BLUEJAY_DIR"
-value: {
- string_value: "device/google/bluejay-kernels/5.10/trunk-11768877"
-}
diff --git a/flag_values/trunk/RELEASE_KERNEL_BLUEJAY_VERSION.textproto b/flag_values/trunk/RELEASE_KERNEL_BLUEJAY_VERSION.textproto
deleted file mode 100644
index 07f19179..00000000
--- a/flag_values/trunk/RELEASE_KERNEL_BLUEJAY_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_BLUEJAY_VERSION"
-value: {
- string_value: "5.10"
-}
diff --git a/flag_values/trunk/RELEASE_KERNEL_CHEETAH_DIR.textproto b/flag_values/trunk/RELEASE_KERNEL_CHEETAH_DIR.textproto
deleted file mode 100644
index ef0cdf38..00000000
--- a/flag_values/trunk/RELEASE_KERNEL_CHEETAH_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_CHEETAH_DIR"
-value: {
- string_value: "device/google/pantah-kernels/5.10/trunk-11768877"
-}
diff --git a/flag_values/trunk/RELEASE_KERNEL_CHEETAH_VERSION.textproto b/flag_values/trunk/RELEASE_KERNEL_CHEETAH_VERSION.textproto
deleted file mode 100644
index fcb91b8f..00000000
--- a/flag_values/trunk/RELEASE_KERNEL_CHEETAH_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_CHEETAH_VERSION"
-value: {
- string_value: "5.10"
-}
diff --git a/flag_values/trunk/RELEASE_KERNEL_FELIX_DIR.textproto b/flag_values/trunk/RELEASE_KERNEL_FELIX_DIR.textproto
deleted file mode 100644
index 1a281251..00000000
--- a/flag_values/trunk/RELEASE_KERNEL_FELIX_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_FELIX_DIR"
-value: {
- string_value: "device/google/felix-kernels/5.10/trunk-11768877"
-}
diff --git a/flag_values/trunk/RELEASE_KERNEL_FELIX_VERSION.textproto b/flag_values/trunk/RELEASE_KERNEL_FELIX_VERSION.textproto
deleted file mode 100644
index 05ffa7fb..00000000
--- a/flag_values/trunk/RELEASE_KERNEL_FELIX_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_FELIX_VERSION"
-value: {
- string_value: "5.10"
-}
diff --git a/flag_values/trunk/RELEASE_KERNEL_HUSKY_DIR.textproto b/flag_values/trunk/RELEASE_KERNEL_HUSKY_DIR.textproto
deleted file mode 100644
index e3a2665d..00000000
--- a/flag_values/trunk/RELEASE_KERNEL_HUSKY_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_HUSKY_DIR"
-value: {
- string_value: "device/google/shusky-kernels/5.15/trunk-11782637"
-}
diff --git a/flag_values/trunk/RELEASE_KERNEL_HUSKY_VERSION.textproto b/flag_values/trunk/RELEASE_KERNEL_HUSKY_VERSION.textproto
deleted file mode 100644
index 19a08ff6..00000000
--- a/flag_values/trunk/RELEASE_KERNEL_HUSKY_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_HUSKY_VERSION"
-value: {
- string_value: "5.15"
-}
diff --git a/flag_values/trunk/RELEASE_KERNEL_LYNX_DIR.textproto b/flag_values/trunk/RELEASE_KERNEL_LYNX_DIR.textproto
deleted file mode 100644
index d39200dc..00000000
--- a/flag_values/trunk/RELEASE_KERNEL_LYNX_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_LYNX_DIR"
-value: {
- string_value: "device/google/lynx-kernels/5.10/trunk-11768877"
-}
diff --git a/flag_values/trunk/RELEASE_KERNEL_LYNX_VERSION.textproto b/flag_values/trunk/RELEASE_KERNEL_LYNX_VERSION.textproto
deleted file mode 100644
index 3e2d971a..00000000
--- a/flag_values/trunk/RELEASE_KERNEL_LYNX_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_LYNX_VERSION"
-value: {
- string_value: "5.10"
-}
diff --git a/flag_values/trunk/RELEASE_KERNEL_ORIOLE_DIR.textproto b/flag_values/trunk/RELEASE_KERNEL_ORIOLE_DIR.textproto
deleted file mode 100644
index d7b6e9fc..00000000
--- a/flag_values/trunk/RELEASE_KERNEL_ORIOLE_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_ORIOLE_DIR"
-value: {
- string_value: "device/google/raviole-kernels/5.10/trunk-11768877"
-}
diff --git a/flag_values/trunk/RELEASE_KERNEL_ORIOLE_VERSION.textproto b/flag_values/trunk/RELEASE_KERNEL_ORIOLE_VERSION.textproto
deleted file mode 100644
index 10cebd28..00000000
--- a/flag_values/trunk/RELEASE_KERNEL_ORIOLE_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_ORIOLE_VERSION"
-value: {
- string_value: "5.10"
-}
diff --git a/flag_values/trunk/RELEASE_KERNEL_PANTHER_DIR.textproto b/flag_values/trunk/RELEASE_KERNEL_PANTHER_DIR.textproto
deleted file mode 100644
index c14e8bf8..00000000
--- a/flag_values/trunk/RELEASE_KERNEL_PANTHER_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_PANTHER_DIR"
-value: {
- string_value: "device/google/pantah-kernels/5.10/trunk-11768877"
-}
diff --git a/flag_values/trunk/RELEASE_KERNEL_PANTHER_VERSION.textproto b/flag_values/trunk/RELEASE_KERNEL_PANTHER_VERSION.textproto
deleted file mode 100644
index 7b0203f4..00000000
--- a/flag_values/trunk/RELEASE_KERNEL_PANTHER_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_PANTHER_VERSION"
-value: {
- string_value: "5.10"
-}
diff --git a/flag_values/trunk/RELEASE_KERNEL_RAVEN_DIR.textproto b/flag_values/trunk/RELEASE_KERNEL_RAVEN_DIR.textproto
deleted file mode 100644
index c3cccf02..00000000
--- a/flag_values/trunk/RELEASE_KERNEL_RAVEN_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_RAVEN_DIR"
-value: {
- string_value: "device/google/raviole-kernels/5.10/trunk-11768877"
-}
diff --git a/flag_values/trunk/RELEASE_KERNEL_RAVEN_VERSION.textproto b/flag_values/trunk/RELEASE_KERNEL_RAVEN_VERSION.textproto
deleted file mode 100644
index 89c747da..00000000
--- a/flag_values/trunk/RELEASE_KERNEL_RAVEN_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_RAVEN_VERSION"
-value: {
- string_value: "5.10"
-}
diff --git a/flag_values/trunk/RELEASE_KERNEL_RIPCURRENT_DIR.textproto b/flag_values/trunk/RELEASE_KERNEL_RIPCURRENT_DIR.textproto
deleted file mode 100644
index 99f13ab2..00000000
--- a/flag_values/trunk/RELEASE_KERNEL_RIPCURRENT_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_RIPCURRENT_DIR"
-value: {
- string_value: "device/google/shusky-kernels/5.15/trunk-11782637"
-}
diff --git a/flag_values/trunk/RELEASE_KERNEL_RIPCURRENT_VERSION.textproto b/flag_values/trunk/RELEASE_KERNEL_RIPCURRENT_VERSION.textproto
deleted file mode 100644
index 9c3a2698..00000000
--- a/flag_values/trunk/RELEASE_KERNEL_RIPCURRENT_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_RIPCURRENT_VERSION"
-value: {
- string_value: "5.15"
-}
diff --git a/flag_values/trunk/RELEASE_KERNEL_SHIBA_DIR.textproto b/flag_values/trunk/RELEASE_KERNEL_SHIBA_DIR.textproto
deleted file mode 100644
index 3a6c0c8b..00000000
--- a/flag_values/trunk/RELEASE_KERNEL_SHIBA_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_SHIBA_DIR"
-value: {
- string_value: "device/google/shusky-kernels/5.15/trunk-11782637"
-}
diff --git a/flag_values/trunk/RELEASE_KERNEL_SHIBA_VERSION.textproto b/flag_values/trunk/RELEASE_KERNEL_SHIBA_VERSION.textproto
deleted file mode 100644
index 9ef0f38c..00000000
--- a/flag_values/trunk/RELEASE_KERNEL_SHIBA_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_SHIBA_VERSION"
-value: {
- string_value: "5.15"
-}
diff --git a/flag_values/trunk/RELEASE_KERNEL_TANGORPRO_DIR.textproto b/flag_values/trunk/RELEASE_KERNEL_TANGORPRO_DIR.textproto
deleted file mode 100644
index 89764452..00000000
--- a/flag_values/trunk/RELEASE_KERNEL_TANGORPRO_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_TANGORPRO_DIR"
-value: {
- string_value: "device/google/tangorpro-kernels/5.10/trunk-11768877"
-}
diff --git a/flag_values/trunk/RELEASE_KERNEL_TANGORPRO_VERSION.textproto b/flag_values/trunk/RELEASE_KERNEL_TANGORPRO_VERSION.textproto
deleted file mode 100644
index 2b8cf8bf..00000000
--- a/flag_values/trunk/RELEASE_KERNEL_TANGORPRO_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_TANGORPRO_VERSION"
-value: {
- string_value: "5.10"
-}
diff --git a/flag_values/trunk/RELEASE_LARGE_SYSTEM_PROPERTY_NODE.textproto b/flag_values/trunk/RELEASE_LARGE_SYSTEM_PROPERTY_NODE.textproto
deleted file mode 100644
index d31771e1..00000000
--- a/flag_values/trunk/RELEASE_LARGE_SYSTEM_PROPERTY_NODE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_LARGE_SYSTEM_PROPERTY_NODE"
-value: {
- bool_value: true
-}
diff --git a/flag_values/trunk/RELEASE_PACKAGE_FLAG_EMOJI_FONT_VERSION.textproto b/flag_values/trunk/RELEASE_PACKAGE_FLAG_EMOJI_FONT_VERSION.textproto
deleted file mode 100644
index 8c8a8ebc..00000000
--- a/flag_values/trunk/RELEASE_PACKAGE_FLAG_EMOJI_FONT_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_FLAG_EMOJI_FONT_VERSION"
-value: {
- string_value: "2.042"
-}
diff --git a/flag_values/trunk/RELEASE_PACKAGE_HENTAIGANA_FONT.textproto b/flag_values/trunk/RELEASE_PACKAGE_HENTAIGANA_FONT.textproto
deleted file mode 100644
index 22219363..00000000
--- a/flag_values/trunk/RELEASE_PACKAGE_HENTAIGANA_FONT.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_HENTAIGANA_FONT"
-value: {
- bool_value: true
-}
diff --git a/flag_values/trunk/RELEASE_PACKAGE_LIBANDROID_RUNTIME_PUNCH_HOLES.textproto b/flag_values/trunk/RELEASE_PACKAGE_LIBANDROID_RUNTIME_PUNCH_HOLES.textproto
deleted file mode 100644
index 8aaf8da7..00000000
--- a/flag_values/trunk/RELEASE_PACKAGE_LIBANDROID_RUNTIME_PUNCH_HOLES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_LIBANDROID_RUNTIME_PUNCH_HOLES"
-value: {
- bool_value: true
-}
diff --git a/flag_values/trunk/RELEASE_PACKAGE_LIBSQLITE3.textproto b/flag_values/trunk/RELEASE_PACKAGE_LIBSQLITE3.textproto
deleted file mode 100644
index bb903b8d..00000000
--- a/flag_values/trunk/RELEASE_PACKAGE_LIBSQLITE3.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_LIBSQLITE3"
-value: {
- string_value: "3440300"
-}
diff --git a/flag_values/trunk/RELEASE_PACKAGE_NFC_STACK.textproto b/flag_values/trunk/RELEASE_PACKAGE_NFC_STACK.textproto
deleted file mode 100644
index f0b126a9..00000000
--- a/flag_values/trunk/RELEASE_PACKAGE_NFC_STACK.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_NFC_STACK"
-value: {
- string_value: "com.android.nfcservices"
-}
diff --git a/flag_values/trunk/RELEASE_PACKAGE_PROFILING_MODULE.textproto b/flag_values/trunk/RELEASE_PACKAGE_PROFILING_MODULE.textproto
deleted file mode 100644
index fe523590..00000000
--- a/flag_values/trunk/RELEASE_PACKAGE_PROFILING_MODULE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_PROFILING_MODULE"
-value: {
- bool_value: true
-}
diff --git a/flag_values/trunk/RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK.textproto b/flag_values/trunk/RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK.textproto
deleted file mode 100644
index 6bfbf143..00000000
--- a/flag_values/trunk/RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK"
-value: {
- bool_value: true
-}
diff --git a/flag_values/trunk/RELEASE_PACKAGE_VIRTUAL_CAMERA.textproto b/flag_values/trunk/RELEASE_PACKAGE_VIRTUAL_CAMERA.textproto
deleted file mode 100644
index 54fe1061..00000000
--- a/flag_values/trunk/RELEASE_PACKAGE_VIRTUAL_CAMERA.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_VIRTUAL_CAMERA"
-value: {
- string_value: "virtual_camera"
-}
diff --git a/flag_values/trunk/RELEASE_PLATFORM_SECURITY_PATCH.textproto b/flag_values/trunk/RELEASE_PLATFORM_SECURITY_PATCH.textproto
deleted file mode 100644
index 75f8319e..00000000
--- a/flag_values/trunk/RELEASE_PLATFORM_SECURITY_PATCH.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PLATFORM_SECURITY_PATCH"
-value: {
- string_value: "2024-06-05"
-}
diff --git a/flag_values/trunk/RELEASE_REMOVE_LEGACY_EMOJI_FONT.textproto b/flag_values/trunk/RELEASE_REMOVE_LEGACY_EMOJI_FONT.textproto
deleted file mode 100644
index 291e5aae..00000000
--- a/flag_values/trunk/RELEASE_REMOVE_LEGACY_EMOJI_FONT.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_REMOVE_LEGACY_EMOJI_FONT"
-value: {
- bool_value: true
-}
diff --git a/flag_values/trunk/RELEASE_SELINUX_DATA_DATA_IGNORE.textproto b/flag_values/trunk/RELEASE_SELINUX_DATA_DATA_IGNORE.textproto
deleted file mode 100644
index 8f9fa825..00000000
--- a/flag_values/trunk/RELEASE_SELINUX_DATA_DATA_IGNORE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_SELINUX_DATA_DATA_IGNORE"
-value: {
- bool_value: true
-}
diff --git a/flag_values/trunk/RELEASE_SM_OPEN_DECLARED_PASSTHROUGH_HAL.textproto b/flag_values/trunk/RELEASE_SM_OPEN_DECLARED_PASSTHROUGH_HAL.textproto
deleted file mode 100644
index 99db9278..00000000
--- a/flag_values/trunk/RELEASE_SM_OPEN_DECLARED_PASSTHROUGH_HAL.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_SM_OPEN_DECLARED_PASSTHROUGH_HAL"
-value: {
- bool_value: true
-}
diff --git a/flag_values/trunk/RELEASE_WRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES.textproto b/flag_values/trunk/RELEASE_WRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES.textproto
deleted file mode 100644
index 4f37937d..00000000
--- a/flag_values/trunk/RELEASE_WRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_WRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES"
-value: {
- bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT_DIR.textproto
index 3898c2d2..935472d4 100644
--- a/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT_DIR.textproto
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT_DIR.textproto
@@ -1,4 +1,4 @@
name: "RELEASE_KERNEL_RIPCURRENT_DIR"
value: {
- string_value: "device/google/shusky-kernels/5.15/trunk-11807386"
+ string_value: "device/google/shusky-kernels/5.15/trunk-11828503"
}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_SHIBA_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_SHIBA_DIR.textproto
index afe60461..156c8054 100644
--- a/flag_values/trunk_staging/RELEASE_KERNEL_SHIBA_DIR.textproto
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_SHIBA_DIR.textproto
@@ -1,4 +1,4 @@
name: "RELEASE_KERNEL_SHIBA_DIR"
value: {
- string_value: "device/google/shusky-kernels/5.15/trunk-11807386"
+ string_value: "device/google/shusky-kernels/5.15/trunk-11828503"
}
diff --git a/release_config_map.mk b/release_config_map.mk
index a7f1d4db..54825722 100644
--- a/release_config_map.mk
+++ b/release_config_map.mk
@@ -20,15 +20,15 @@ local_dir := $(dir $(lastword $(MAKEFILE_LIST)))
FLAG_DECLARATION_FILES := $(local_dir)build_flags.scl
# Attach the flag value definitions to the various release configurations.
-$(call declare-release-config, next, $(local_dir)build_config/next.scl $(local_dir)build_config/fail.scl)
-$(call declare-release-config, trunk, $(local_dir)build_config/trunk.scl $(local_dir)build_config/fail.scl)
-$(call declare-release-config, trunk_food, $(local_dir)build_config/trunk_food.scl $(local_dir)build_config/fail.scl, trunk)
$(call declare-release-config, trunk_staging, $(local_dir)build_config/trunk_staging.scl $(local_dir)build_config/fail.scl)
+# TODO: remove these when we can drop them everywhere. For now, fail of we
+# try to use the outdated configs
+$(call declare-release-config, next, $(local_dir)build_config/fail.scl)
+$(call declare-release-config, trunk, $(local_dir)build_config/fail.scl)
+$(call declare-release-config, trunk_food, $(local_dir)build_config/fail.scl, trunk)
+
# 24Q2, aka AP2A
$(call declare-release-config, ap2a, $(local_dir)build_config/ap2a.scl)
-# Temporary config to ease testing build flag migration to protobuf
-$(call declare-release-config, protobuf_flags, $(local_dir)build_config/protobuf_flags.scl $(local_dir)build_config/fail.scl, trunk_staging)
-
local_dir :=
diff --git a/release_configs/ap3a.textproto b/release_configs/ap3a.textproto
deleted file mode 100644
index c25b670b..00000000
--- a/release_configs/ap3a.textproto
+++ /dev/null
@@ -1 +0,0 @@
-name: "ap3a"
diff --git a/release_configs/protobuf_flags.textproto b/release_configs/protobuf_flags.textproto
deleted file mode 100644
index 032c4c42..00000000
--- a/release_configs/protobuf_flags.textproto
+++ /dev/null
@@ -1,2 +0,0 @@
-name: "protobuf_flags"
-inherits: "trunk_staging"
diff --git a/release_configs/trunk.textproto b/release_configs/trunk.textproto
deleted file mode 100644
index ec05068e..00000000
--- a/release_configs/trunk.textproto
+++ /dev/null
@@ -1 +0,0 @@
-name: "trunk"
diff --git a/release_configs/trunk_food.textproto b/release_configs/trunk_food.textproto
deleted file mode 100644
index c07f804c..00000000
--- a/release_configs/trunk_food.textproto
+++ /dev/null
@@ -1,3 +0,0 @@
-name: "trunk_food"
-inherits: "trunk"
-aconfig_flags_only: true