5 files changed, 128 insertions, 0 deletions

diff --git a/build_config/next.bzl b/build_config/next.bzl
new file mode 100644
index 00000000..e5b3b6e1
--- /dev/null
+++ b/build_config/next.bzl
@@ -0,0 +1,27 @@
+# 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.bzl", "value")
+
+# Flags should be alphabetical by flag name to reduce merge conflifcts
+values = [
+    value("RELEASE_DEVICE_CONFIG_VALUE_SETS", "device_config_value_set-next"),
+    value("RELEASE_PLATFORM_VERSION", "UP1A"),
+]
diff --git a/build_config/trunk.bzl b/build_config/trunk.bzl
new file mode 100644
index 00000000..0c08f3fa
--- /dev/null
+++ b/build_config/trunk.bzl
@@ -0,0 +1,26 @@
+# 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.bzl", "value")
+
+# Flags should be alphabetical by flag name to reduce merge conflifcts
+values = [
+    value("RELEASE_DEVICE_CONFIG_VALUE_SETS", "device_config_value_set-trunk"),
+]
diff --git a/build_config/trunk_food.bzl b/build_config/trunk_food.bzl
new file mode 100644
index 00000000..7e9bb150
--- /dev/null
+++ b/build_config/trunk_food.bzl
@@ -0,0 +1,26 @@
+# 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.bzl", "value")
+
+# Flags should be alphabetical by flag name to reduce merge conflifcts
+values = [
+    value("RELEASE_DEVICE_CONFIG_VALUE_SETS", "device_config_value_set-trunk_food"),
+]
diff --git a/build_config/trunk_staging.bzl b/build_config/trunk_staging.bzl
new file mode 100644
index 00000000..0fda4b66
--- /dev/null
+++ b/build_config/trunk_staging.bzl
@@ -0,0 +1,26 @@
+# 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_staging-<variant>` builds
+#                                                      ^^^^^^^^^^^^^
+# See go/build-system-flags
+#
+
+load("//build/make/core/release_config.bzl", "value")
+
+# Flags should be alphabetical by flag name to reduce merge conflifcts
+values = [
+    value("RELEASE_DEVICE_CONFIG_VALUE_SETS", "device_config_value_set-trunk_staging"),
+]
diff --git a/release_config_map.mk b/release_config_map.mk
new file mode 100644
index 00000000..f92f76bb
--- /dev/null
+++ b/release_config_map.mk
@@ -0,0 +1,23 @@
+# 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.
+
+$(call declare-release-config, next, build/release/build_config/next.bzl)
+$(call declare-release-config, trunk, build/release/build_config/trunk.bzl)
+$(call declare-release-config, trunk_food, build/release/build_config/trunk_food.bzl)
+$(call declare-release-config, trunk_staging, build/release/build_config/trunk_staging.bzl)
+
+# Temporary, until we remove the old "staging" configs
+$(call declare-release-config, staging, build/release/build_config/trunk_staging.bzl)
+
+