Revert "Require protobuf except for ap2a"

This reverts commit 5e224a1edbdc2f38dd9ececad71d2d9f5cf8f762.

Reason for revert:DroidMonitor. Potential culprit for b/339848877 - verifying through ABTD before submission. 

Change-Id: I2f2de0571c8273518784b4d36cde84965aa18e52

8 files changed, 8 insertions, 33 deletions

diff --git a/build_config/DEFAULT=proto b/build_config/DEFAULT=proto
deleted file mode 100644
index e69de29b..00000000
--- a/build_config/DEFAULT=proto
+++ /dev/null
diff --git a/build_config/ap2a.scl b/build_config/ap2a.scl
index d82ebfe9..460120dc 100644
--- a/build_config/ap2a.scl
+++ b/build_config/ap2a.scl
@@ -30,7 +30,6 @@ 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
deleted file mode 100644
index e69de29b..00000000
--- a/build_config/ap2a=make
+++ /dev/null
diff --git a/build_config/fail.scl b/build_config/fail.scl
deleted file mode 100644
index 70f5954c..00000000
--- a/build_config/fail.scl
+++ /dev/null
@@ -1,24 +0,0 @@
-"""
-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 ffee13b9..36590f4a 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, True, origin="aosp"),
+    flag("RELEASE_BUILD_FLAGS_IN_PROTOBUF", ALL, False, 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 b78784da..b94cbc5a 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: true
+  bool_value: false
 }
 workflow: LAUNCH
 containers: "product"
diff --git a/flag_values/ap2a/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto b/flag_values/trunk_staging/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto
index 8889462d..3656a78f 100644
--- a/flag_values/ap2a/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto
+++ b/flag_values/trunk_staging/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_BUILD_FLAGS_IN_PROTOBUF"
 value: {
-  bool_value: false
+  bool_value: true
 }
diff --git a/release_config_map.mk b/release_config_map.mk
index a7f1d4db..16d27760 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)
+$(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)
 
 # 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)
+$(call declare-release-config, protobuf_flags, $(local_dir)build_config/protobuf_flags.scl, trunk_staging)
 
 local_dir :=