Resubmit "Require protobuf except for ap2a"

This reverts commit 390a0cf9e345e976b314089c6932284a342afaac.

Reason for revert: resubmitting once the deprecated builds targets are disabled on git_main-without-vendor (cl/632571091)

Change-Id: I7e960badcde1e288bec85195b5107024a0111fa1

8 files changed, 33 insertions, 8 deletions

diff --git a/build_config/DEFAULT=proto b/build_config/DEFAULT=proto
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/build_config/DEFAULT=proto
diff --git a/build_config/ap2a.scl b/build_config/ap2a.scl
index 460120dc..d82ebfe9 100644
--- a/build_config/ap2a.scl
+++ b/build_config/ap2a.scl
@@ -30,6 +30,7 @@ values = [
     value("RELEASE_ACONFIG_VALUE_SETS", "aconfig_value_set-aosp-ap2a"),
     value("RELEASE_AIDL_USE_UNFROZEN", False),
     value("RELEASE_BOARD_API_LEVEL", "202404"),
+    value("RELEASE_BUILD_FLAGS_IN_PROTOBUF", False),
     value("RELEASE_DEPRECATE_VNDK", True),
     value("RELEASE_PLATFORM_SDK_EXTENSION_VERSION", "11"),
     value("RELEASE_PLATFORM_SDK_VERSION", "34"),
diff --git a/build_config/ap2a=make b/build_config/ap2a=make
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/build_config/ap2a=make
diff --git a/build_config/fail.scl b/build_config/fail.scl
new file mode 100644
index 00000000..70f5954c
--- /dev/null
+++ b/build_config/fail.scl
@@ -0,0 +1,24 @@
+"""
+Build flag values for release config next.
+"""
+# Copyright (C) 2024 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
+#
+
+fail("This release config now uses protobuf only: see go/android-build-flags")
diff --git a/build_flags.scl b/build_flags.scl
index 36590f4a..ffee13b9 100644
--- a/build_flags.scl
+++ b/build_flags.scl
@@ -133,7 +133,7 @@ flags = [
     # Enable protobuf version of build flag processing.
     # When true, the canonical source of truth for build flags is in the
     # protobuf version of the data.
-    flag("RELEASE_BUILD_FLAGS_IN_PROTOBUF", ALL, False, origin="aosp"),
+    flag("RELEASE_BUILD_FLAGS_IN_PROTOBUF", ALL, True, origin="aosp"),
 
     # If true, then crashrecovery module is enabled as an apex
     flag("RELEASE_CRASHRECOVERY_MODULE", ALL, False, origin="aosp"),
diff --git a/flag_declarations/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto b/flag_declarations/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto
index b94cbc5a..b78784da 100644
--- a/flag_declarations/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto
+++ b/flag_declarations/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto
@@ -2,7 +2,7 @@ name: "RELEASE_BUILD_FLAGS_IN_PROTOBUF"
 namespace: "android_UNKNOWN"
 description: "Enable protobuf version of build flag processing. When true, the canonical source of truth for build flags is in the protobuf version of the data."
 value: {
-  bool_value: false
+  bool_value: true
 }
 workflow: LAUNCH
 containers: "product"
diff --git a/flag_values/trunk_staging/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto b/flag_values/ap2a/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto
index 3656a78f..8889462d 100644
--- a/flag_values/trunk_staging/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto
+++ b/flag_values/ap2a/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_BUILD_FLAGS_IN_PROTOBUF"
 value: {
-  bool_value: true
+  bool_value: false
 }
diff --git a/release_config_map.mk b/release_config_map.mk
index 16d27760..a7f1d4db 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)
-$(call declare-release-config, trunk, $(local_dir)build_config/trunk.scl)
-$(call declare-release-config, trunk_food, $(local_dir)build_config/trunk_food.scl, trunk)
-$(call declare-release-config, trunk_staging, $(local_dir)build_config/trunk_staging.scl)
+$(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)
 
 # 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, trunk_staging)
+$(call declare-release-config, protobuf_flags, $(local_dir)build_config/protobuf_flags.scl $(local_dir)build_config/fail.scl, trunk_staging)
 
 local_dir :=