From 43c1a8bd597654e04df31b4c96194adcea8ef49c Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Fri, 6 Dec 2024 08:52:15 +0200 Subject: [PATCH] release: Bump aconfig flags extension to AP4A Change-Id: Ifc7fd31dc7a26bedd47a4e85a8c8cc5bd9c0d36a --- .../all_notifs_need_ttl_flag_values.textproto | 6 ------ ...hide_unused_channels_flag_values.textproto | 6 ------ ...ct_old_notifications_flag_values.textproto | 6 ------ .../com.android.settings.flags/Android.bp | 21 ------------------- .../homepage_revamp_flag_values.textproto | 6 ------ release/aconfig/{ap3a => ap4a}/Android.bp | 5 ++--- .../Android.bp | 2 +- ...polite_notifications_flag_values.textproto | 0 ...ications_attn_update_flag_values.textproto | 0 ...polite_notifications_flag_values.textproto | 0 release/build_config/{ap3a.scl => ap4a.scl} | 2 +- .../{ap3a.textproto => ap4a.textproto} | 2 +- .../RELEASE_KERNEL_CAIMAN_DIR.textproto | 8 ------- .../RELEASE_KERNEL_COMET_DIR.textproto | 8 ------- .../RELEASE_KERNEL_KOMODO_DIR.textproto | 8 ------- .../RELEASE_KERNEL_TOKAY_DIR.textproto | 8 ------- .../ap3a/RELEASE_KERNEL_CAIMAN_DIR.textproto | 4 ---- .../ap3a/RELEASE_KERNEL_COMET_DIR.textproto | 4 ---- .../ap3a/RELEASE_KERNEL_KOMODO_DIR.textproto | 4 ---- .../ap3a/RELEASE_KERNEL_TOKAY_DIR.textproto | 4 ---- .../RELEASE_PIXEL_AIDL_AUDIO_HAL.textproto | 0 ...ELEASE_PIXEL_AIDL_AUDIO_HAL_ZUMA.textproto | 0 ...IXEL_AIDL_BATTERY_MITIGATION_HAL.textproto | 0 .../RELEASE_PIXEL_BROADCAST_ENABLED.textproto | 0 .../RELEASE_SVN_AKITA.textproto | 2 +- .../RELEASE_SVN_BLUEJAY.textproto | 2 +- .../RELEASE_SVN_CAIMAN.textproto | 2 +- .../RELEASE_SVN_CHEETAH.textproto | 2 +- .../RELEASE_SVN_COMET.textproto | 2 +- .../RELEASE_SVN_FELIX.textproto | 2 +- .../RELEASE_SVN_HUSKY.textproto | 2 +- .../RELEASE_SVN_KOMODO.textproto | 2 +- .../{ap3a => ap4a}/RELEASE_SVN_LYNX.textproto | 2 +- .../RELEASE_SVN_ORIOLE.textproto | 2 +- .../RELEASE_SVN_PANTHER.textproto | 2 +- .../RELEASE_SVN_RAVEN.textproto | 2 +- .../RELEASE_SVN_SHIBA.textproto | 2 +- .../RELEASE_SVN_TOKAY.textproto | 2 +- release/release_config_map.mk | 2 +- release/release_config_map.textproto | 8 +++---- release/release_configs/ap3a.textproto | 3 --- release/release_configs/ap4a.textproto | 3 +++ 42 files changed, 27 insertions(+), 121 deletions(-) delete mode 100644 release/aconfig/ap3a/com.android.server.notification/all_notifs_need_ttl_flag_values.textproto delete mode 100644 release/aconfig/ap3a/com.android.server.notification/notification_hide_unused_channels_flag_values.textproto delete mode 100644 release/aconfig/ap3a/com.android.server.notification/reject_old_notifications_flag_values.textproto delete mode 100644 release/aconfig/ap3a/com.android.settings.flags/Android.bp delete mode 100644 release/aconfig/ap3a/com.android.settings.flags/homepage_revamp_flag_values.textproto rename release/aconfig/{ap3a => ap4a}/Android.bp (79%) rename release/aconfig/{ap3a => ap4a}/com.android.server.notification/Android.bp (91%) rename release/aconfig/{ap3a => ap4a}/com.android.server.notification/cross_app_polite_notifications_flag_values.textproto (100%) rename release/aconfig/{ap3a => ap4a}/com.android.server.notification/polite_notifications_attn_update_flag_values.textproto (100%) rename release/aconfig/{ap3a => ap4a}/com.android.server.notification/polite_notifications_flag_values.textproto (100%) rename release/build_config/{ap3a.scl => ap4a.scl} (98%) rename release/build_config/{ap3a.textproto => ap4a.textproto} (58%) delete mode 100644 release/flag_declarations/RELEASE_KERNEL_CAIMAN_DIR.textproto delete mode 100644 release/flag_declarations/RELEASE_KERNEL_COMET_DIR.textproto delete mode 100644 release/flag_declarations/RELEASE_KERNEL_KOMODO_DIR.textproto delete mode 100644 release/flag_declarations/RELEASE_KERNEL_TOKAY_DIR.textproto delete mode 100644 release/flag_values/ap3a/RELEASE_KERNEL_CAIMAN_DIR.textproto delete mode 100644 release/flag_values/ap3a/RELEASE_KERNEL_COMET_DIR.textproto delete mode 100644 release/flag_values/ap3a/RELEASE_KERNEL_KOMODO_DIR.textproto delete mode 100644 release/flag_values/ap3a/RELEASE_KERNEL_TOKAY_DIR.textproto rename release/flag_values/{ap3a => ap4a}/RELEASE_PIXEL_AIDL_AUDIO_HAL.textproto (100%) rename release/flag_values/{ap3a => ap4a}/RELEASE_PIXEL_AIDL_AUDIO_HAL_ZUMA.textproto (100%) rename release/flag_values/{ap3a => ap4a}/RELEASE_PIXEL_AIDL_BATTERY_MITIGATION_HAL.textproto (100%) rename release/flag_values/{ap3a => ap4a}/RELEASE_PIXEL_BROADCAST_ENABLED.textproto (100%) rename release/flag_values/{ap3a => ap4a}/RELEASE_SVN_AKITA.textproto (63%) rename release/flag_values/{ap3a => ap4a}/RELEASE_SVN_BLUEJAY.textproto (65%) rename release/flag_values/{ap3a => ap4a}/RELEASE_SVN_CAIMAN.textproto (64%) rename release/flag_values/{ap3a => ap4a}/RELEASE_SVN_CHEETAH.textproto (65%) rename release/flag_values/{ap3a => ap4a}/RELEASE_SVN_COMET.textproto (63%) rename release/flag_values/{ap3a => ap4a}/RELEASE_SVN_FELIX.textproto (63%) rename release/flag_values/{ap3a => ap4a}/RELEASE_SVN_HUSKY.textproto (63%) rename release/flag_values/{ap3a => ap4a}/RELEASE_SVN_KOMODO.textproto (64%) rename release/flag_values/{ap3a => ap4a}/RELEASE_SVN_LYNX.textproto (63%) rename release/flag_values/{ap3a => ap4a}/RELEASE_SVN_ORIOLE.textproto (64%) rename release/flag_values/{ap3a => ap4a}/RELEASE_SVN_PANTHER.textproto (65%) rename release/flag_values/{ap3a => ap4a}/RELEASE_SVN_RAVEN.textproto (63%) rename release/flag_values/{ap3a => ap4a}/RELEASE_SVN_SHIBA.textproto (63%) rename release/flag_values/{ap3a => ap4a}/RELEASE_SVN_TOKAY.textproto (63%) delete mode 100644 release/release_configs/ap3a.textproto create mode 100644 release/release_configs/ap4a.textproto diff --git a/release/aconfig/ap3a/com.android.server.notification/all_notifs_need_ttl_flag_values.textproto b/release/aconfig/ap3a/com.android.server.notification/all_notifs_need_ttl_flag_values.textproto deleted file mode 100644 index aa48777c..00000000 --- a/release/aconfig/ap3a/com.android.server.notification/all_notifs_need_ttl_flag_values.textproto +++ /dev/null @@ -1,6 +0,0 @@ -flag_value { - package: "com.android.server.notification" - name: "all_notifs_need_ttl" - state: ENABLED - permission: READ_WRITE -} diff --git a/release/aconfig/ap3a/com.android.server.notification/notification_hide_unused_channels_flag_values.textproto b/release/aconfig/ap3a/com.android.server.notification/notification_hide_unused_channels_flag_values.textproto deleted file mode 100644 index 9385ca13..00000000 --- a/release/aconfig/ap3a/com.android.server.notification/notification_hide_unused_channels_flag_values.textproto +++ /dev/null @@ -1,6 +0,0 @@ -flag_value { - package: "com.android.server.notification" - name: "notification_hide_unused_channels" - state: ENABLED - permission: READ_WRITE -} diff --git a/release/aconfig/ap3a/com.android.server.notification/reject_old_notifications_flag_values.textproto b/release/aconfig/ap3a/com.android.server.notification/reject_old_notifications_flag_values.textproto deleted file mode 100644 index e46725cd..00000000 --- a/release/aconfig/ap3a/com.android.server.notification/reject_old_notifications_flag_values.textproto +++ /dev/null @@ -1,6 +0,0 @@ -flag_value { - package: "com.android.server.notification" - name: "reject_old_notifications" - state: ENABLED - permission: READ_WRITE -} diff --git a/release/aconfig/ap3a/com.android.settings.flags/Android.bp b/release/aconfig/ap3a/com.android.settings.flags/Android.bp deleted file mode 100644 index b6edec6f..00000000 --- a/release/aconfig/ap3a/com.android.settings.flags/Android.bp +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2024 Google Inc. All rights reserved. -// -// 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. - -aconfig_values { - name: "aconfig-values-ap3a-com.android.settings.flags-all", - package: "com.android.settings.flags", - srcs: [ - "*_flag_values.textproto", - ] -} diff --git a/release/aconfig/ap3a/com.android.settings.flags/homepage_revamp_flag_values.textproto b/release/aconfig/ap3a/com.android.settings.flags/homepage_revamp_flag_values.textproto deleted file mode 100644 index bc78c0e9..00000000 --- a/release/aconfig/ap3a/com.android.settings.flags/homepage_revamp_flag_values.textproto +++ /dev/null @@ -1,6 +0,0 @@ -flag_value { - package: "com.android.settings.flags" - name: "homepage_revamp" - state: ENABLED - permission: READ_WRITE -} diff --git a/release/aconfig/ap3a/Android.bp b/release/aconfig/ap4a/Android.bp similarity index 79% rename from release/aconfig/ap3a/Android.bp rename to release/aconfig/ap4a/Android.bp index af0e71c5..c477523f 100644 --- a/release/aconfig/ap3a/Android.bp +++ b/release/aconfig/ap4a/Android.bp @@ -14,9 +14,8 @@ // limitations under the License. aconfig_value_set { - name: "aconfig_value_set-lineage-ap3a", + name: "aconfig_value_set-lineage-ap4a", values: [ - "aconfig-values-ap3a-com.android.server.notification-all", - "aconfig-values-ap3a-com.android.settings.flags-all", + "aconfig-values-ap4a-com.android.server.notification-all", ], } diff --git a/release/aconfig/ap3a/com.android.server.notification/Android.bp b/release/aconfig/ap4a/com.android.server.notification/Android.bp similarity index 91% rename from release/aconfig/ap3a/com.android.server.notification/Android.bp rename to release/aconfig/ap4a/com.android.server.notification/Android.bp index 8b67acec..0610c5d7 100644 --- a/release/aconfig/ap3a/com.android.server.notification/Android.bp +++ b/release/aconfig/ap4a/com.android.server.notification/Android.bp @@ -13,7 +13,7 @@ // limitations under the License. aconfig_values { - name: "aconfig-values-ap3a-com.android.server.notification-all", + name: "aconfig-values-ap4a-com.android.server.notification-all", package: "com.android.server.notification", srcs: [ "*_flag_values.textproto", diff --git a/release/aconfig/ap3a/com.android.server.notification/cross_app_polite_notifications_flag_values.textproto b/release/aconfig/ap4a/com.android.server.notification/cross_app_polite_notifications_flag_values.textproto similarity index 100% rename from release/aconfig/ap3a/com.android.server.notification/cross_app_polite_notifications_flag_values.textproto rename to release/aconfig/ap4a/com.android.server.notification/cross_app_polite_notifications_flag_values.textproto diff --git a/release/aconfig/ap3a/com.android.server.notification/polite_notifications_attn_update_flag_values.textproto b/release/aconfig/ap4a/com.android.server.notification/polite_notifications_attn_update_flag_values.textproto similarity index 100% rename from release/aconfig/ap3a/com.android.server.notification/polite_notifications_attn_update_flag_values.textproto rename to release/aconfig/ap4a/com.android.server.notification/polite_notifications_attn_update_flag_values.textproto diff --git a/release/aconfig/ap3a/com.android.server.notification/polite_notifications_flag_values.textproto b/release/aconfig/ap4a/com.android.server.notification/polite_notifications_flag_values.textproto similarity index 100% rename from release/aconfig/ap3a/com.android.server.notification/polite_notifications_flag_values.textproto rename to release/aconfig/ap4a/com.android.server.notification/polite_notifications_flag_values.textproto diff --git a/release/build_config/ap3a.scl b/release/build_config/ap4a.scl similarity index 98% rename from release/build_config/ap3a.scl rename to release/build_config/ap4a.scl index 1391a69f..d808ac1b 100644 --- a/release/build_config/ap3a.scl +++ b/release/build_config/ap4a.scl @@ -18,6 +18,6 @@ load("//build/make/core/release_config.scl", "value") values = [ # keep-sorted start numeric=yes - value("RELEASE_ACONFIG_VALUE_SETS", "aconfig_value_set-lineage-ap3a"), + value("RELEASE_ACONFIG_VALUE_SETS", "aconfig_value_set-lineage-ap4a"), # keep-sorted end ] diff --git a/release/build_config/ap3a.textproto b/release/build_config/ap4a.textproto similarity index 58% rename from release/build_config/ap3a.textproto rename to release/build_config/ap4a.textproto index 15bf98d0..2440f4ea 100644 --- a/release/build_config/ap3a.textproto +++ b/release/build_config/ap4a.textproto @@ -1,6 +1,6 @@ values: [ { name: "RELEASE_ACONFIG_VALUE_SETS" - value: "aconfig_value_set-lineage-ap3a" + value: "aconfig_value_set-lineage-ap4a" } ] diff --git a/release/flag_declarations/RELEASE_KERNEL_CAIMAN_DIR.textproto b/release/flag_declarations/RELEASE_KERNEL_CAIMAN_DIR.textproto deleted file mode 100644 index 9025e013..00000000 --- a/release/flag_declarations/RELEASE_KERNEL_CAIMAN_DIR.textproto +++ /dev/null @@ -1,8 +0,0 @@ -name: "RELEASE_KERNEL_CAIMAN_DIR" -namespace: "android_UNKNOWN" -description: "" -value: { - string_value: "" -} -workflow: PREBUILT -containers: "vendor" diff --git a/release/flag_declarations/RELEASE_KERNEL_COMET_DIR.textproto b/release/flag_declarations/RELEASE_KERNEL_COMET_DIR.textproto deleted file mode 100644 index 0b788bdd..00000000 --- a/release/flag_declarations/RELEASE_KERNEL_COMET_DIR.textproto +++ /dev/null @@ -1,8 +0,0 @@ -name: "RELEASE_KERNEL_COMET_DIR" -namespace: "android_UNKNOWN" -description: "" -value: { - string_value: "" -} -workflow: PREBUILT -containers: "vendor" diff --git a/release/flag_declarations/RELEASE_KERNEL_KOMODO_DIR.textproto b/release/flag_declarations/RELEASE_KERNEL_KOMODO_DIR.textproto deleted file mode 100644 index 33db8f3a..00000000 --- a/release/flag_declarations/RELEASE_KERNEL_KOMODO_DIR.textproto +++ /dev/null @@ -1,8 +0,0 @@ -name: "RELEASE_KERNEL_KOMODO_DIR" -namespace: "android_UNKNOWN" -description: "" -value: { - string_value: "" -} -workflow: PREBUILT -containers: "vendor" diff --git a/release/flag_declarations/RELEASE_KERNEL_TOKAY_DIR.textproto b/release/flag_declarations/RELEASE_KERNEL_TOKAY_DIR.textproto deleted file mode 100644 index aaabd6cd..00000000 --- a/release/flag_declarations/RELEASE_KERNEL_TOKAY_DIR.textproto +++ /dev/null @@ -1,8 +0,0 @@ -name: "RELEASE_KERNEL_TOKAY_DIR" -namespace: "android_UNKNOWN" -description: "" -value: { - string_value: "" -} -workflow: PREBUILT -containers: "vendor" diff --git a/release/flag_values/ap3a/RELEASE_KERNEL_CAIMAN_DIR.textproto b/release/flag_values/ap3a/RELEASE_KERNEL_CAIMAN_DIR.textproto deleted file mode 100644 index 6cdf4de5..00000000 --- a/release/flag_values/ap3a/RELEASE_KERNEL_CAIMAN_DIR.textproto +++ /dev/null @@ -1,4 +0,0 @@ -name: "RELEASE_KERNEL_CAIMAN_DIR" -value: { - string_value: "device/google/caimito-kernels/6.1/24Q3-12386881" -} diff --git a/release/flag_values/ap3a/RELEASE_KERNEL_COMET_DIR.textproto b/release/flag_values/ap3a/RELEASE_KERNEL_COMET_DIR.textproto deleted file mode 100644 index 6782de5a..00000000 --- a/release/flag_values/ap3a/RELEASE_KERNEL_COMET_DIR.textproto +++ /dev/null @@ -1,4 +0,0 @@ -name: "RELEASE_KERNEL_COMET_DIR" -value: { - string_value: "device/google/comet-kernels/6.1/24Q3-12386881" -} diff --git a/release/flag_values/ap3a/RELEASE_KERNEL_KOMODO_DIR.textproto b/release/flag_values/ap3a/RELEASE_KERNEL_KOMODO_DIR.textproto deleted file mode 100644 index 7b9fcd12..00000000 --- a/release/flag_values/ap3a/RELEASE_KERNEL_KOMODO_DIR.textproto +++ /dev/null @@ -1,4 +0,0 @@ -name: "RELEASE_KERNEL_KOMODO_DIR" -value: { - string_value: "device/google/caimito-kernels/6.1/24Q3-12386881" -} diff --git a/release/flag_values/ap3a/RELEASE_KERNEL_TOKAY_DIR.textproto b/release/flag_values/ap3a/RELEASE_KERNEL_TOKAY_DIR.textproto deleted file mode 100644 index 41f13558..00000000 --- a/release/flag_values/ap3a/RELEASE_KERNEL_TOKAY_DIR.textproto +++ /dev/null @@ -1,4 +0,0 @@ -name: "RELEASE_KERNEL_TOKAY_DIR" -value: { - string_value: "device/google/caimito-kernels/6.1/24Q3-12386881" -} diff --git a/release/flag_values/ap3a/RELEASE_PIXEL_AIDL_AUDIO_HAL.textproto b/release/flag_values/ap4a/RELEASE_PIXEL_AIDL_AUDIO_HAL.textproto similarity index 100% rename from release/flag_values/ap3a/RELEASE_PIXEL_AIDL_AUDIO_HAL.textproto rename to release/flag_values/ap4a/RELEASE_PIXEL_AIDL_AUDIO_HAL.textproto diff --git a/release/flag_values/ap3a/RELEASE_PIXEL_AIDL_AUDIO_HAL_ZUMA.textproto b/release/flag_values/ap4a/RELEASE_PIXEL_AIDL_AUDIO_HAL_ZUMA.textproto similarity index 100% rename from release/flag_values/ap3a/RELEASE_PIXEL_AIDL_AUDIO_HAL_ZUMA.textproto rename to release/flag_values/ap4a/RELEASE_PIXEL_AIDL_AUDIO_HAL_ZUMA.textproto diff --git a/release/flag_values/ap3a/RELEASE_PIXEL_AIDL_BATTERY_MITIGATION_HAL.textproto b/release/flag_values/ap4a/RELEASE_PIXEL_AIDL_BATTERY_MITIGATION_HAL.textproto similarity index 100% rename from release/flag_values/ap3a/RELEASE_PIXEL_AIDL_BATTERY_MITIGATION_HAL.textproto rename to release/flag_values/ap4a/RELEASE_PIXEL_AIDL_BATTERY_MITIGATION_HAL.textproto diff --git a/release/flag_values/ap3a/RELEASE_PIXEL_BROADCAST_ENABLED.textproto b/release/flag_values/ap4a/RELEASE_PIXEL_BROADCAST_ENABLED.textproto similarity index 100% rename from release/flag_values/ap3a/RELEASE_PIXEL_BROADCAST_ENABLED.textproto rename to release/flag_values/ap4a/RELEASE_PIXEL_BROADCAST_ENABLED.textproto diff --git a/release/flag_values/ap3a/RELEASE_SVN_AKITA.textproto b/release/flag_values/ap4a/RELEASE_SVN_AKITA.textproto similarity index 63% rename from release/flag_values/ap3a/RELEASE_SVN_AKITA.textproto rename to release/flag_values/ap4a/RELEASE_SVN_AKITA.textproto index 7c7279eb..44d23261 100644 --- a/release/flag_values/ap3a/RELEASE_SVN_AKITA.textproto +++ b/release/flag_values/ap4a/RELEASE_SVN_AKITA.textproto @@ -1,4 +1,4 @@ name: "RELEASE_SVN_AKITA" value: { - string_value: "24" + string_value: "25" } diff --git a/release/flag_values/ap3a/RELEASE_SVN_BLUEJAY.textproto b/release/flag_values/ap4a/RELEASE_SVN_BLUEJAY.textproto similarity index 65% rename from release/flag_values/ap3a/RELEASE_SVN_BLUEJAY.textproto rename to release/flag_values/ap4a/RELEASE_SVN_BLUEJAY.textproto index 48cd50ab..dd06d46d 100644 --- a/release/flag_values/ap3a/RELEASE_SVN_BLUEJAY.textproto +++ b/release/flag_values/ap4a/RELEASE_SVN_BLUEJAY.textproto @@ -1,4 +1,4 @@ name: "RELEASE_SVN_BLUEJAY" value: { - string_value: "68" + string_value: "69" } diff --git a/release/flag_values/ap3a/RELEASE_SVN_CAIMAN.textproto b/release/flag_values/ap4a/RELEASE_SVN_CAIMAN.textproto similarity index 64% rename from release/flag_values/ap3a/RELEASE_SVN_CAIMAN.textproto rename to release/flag_values/ap4a/RELEASE_SVN_CAIMAN.textproto index a8f69558..8e5ef564 100644 --- a/release/flag_values/ap3a/RELEASE_SVN_CAIMAN.textproto +++ b/release/flag_values/ap4a/RELEASE_SVN_CAIMAN.textproto @@ -1,4 +1,4 @@ name: "RELEASE_SVN_CAIMAN" value: { - string_value: "08" + string_value: "09" } diff --git a/release/flag_values/ap3a/RELEASE_SVN_CHEETAH.textproto b/release/flag_values/ap4a/RELEASE_SVN_CHEETAH.textproto similarity index 65% rename from release/flag_values/ap3a/RELEASE_SVN_CHEETAH.textproto rename to release/flag_values/ap4a/RELEASE_SVN_CHEETAH.textproto index 58cc16b4..1a7ada2f 100644 --- a/release/flag_values/ap3a/RELEASE_SVN_CHEETAH.textproto +++ b/release/flag_values/ap4a/RELEASE_SVN_CHEETAH.textproto @@ -1,4 +1,4 @@ name: "RELEASE_SVN_CHEETAH" value: { - string_value: "64" + string_value: "65" } diff --git a/release/flag_values/ap3a/RELEASE_SVN_COMET.textproto b/release/flag_values/ap4a/RELEASE_SVN_COMET.textproto similarity index 63% rename from release/flag_values/ap3a/RELEASE_SVN_COMET.textproto rename to release/flag_values/ap4a/RELEASE_SVN_COMET.textproto index 2c38e233..dac8d477 100644 --- a/release/flag_values/ap3a/RELEASE_SVN_COMET.textproto +++ b/release/flag_values/ap4a/RELEASE_SVN_COMET.textproto @@ -1,4 +1,4 @@ name: "RELEASE_SVN_COMET" value: { - string_value: "08" + string_value: "09" } diff --git a/release/flag_values/ap3a/RELEASE_SVN_FELIX.textproto b/release/flag_values/ap4a/RELEASE_SVN_FELIX.textproto similarity index 63% rename from release/flag_values/ap3a/RELEASE_SVN_FELIX.textproto rename to release/flag_values/ap4a/RELEASE_SVN_FELIX.textproto index 6b8933c9..84f42510 100644 --- a/release/flag_values/ap3a/RELEASE_SVN_FELIX.textproto +++ b/release/flag_values/ap4a/RELEASE_SVN_FELIX.textproto @@ -1,4 +1,4 @@ name: "RELEASE_SVN_FELIX" value: { - string_value: "58" + string_value: "59" } diff --git a/release/flag_values/ap3a/RELEASE_SVN_HUSKY.textproto b/release/flag_values/ap4a/RELEASE_SVN_HUSKY.textproto similarity index 63% rename from release/flag_values/ap3a/RELEASE_SVN_HUSKY.textproto rename to release/flag_values/ap4a/RELEASE_SVN_HUSKY.textproto index b52a3ec3..f1938add 100644 --- a/release/flag_values/ap3a/RELEASE_SVN_HUSKY.textproto +++ b/release/flag_values/ap4a/RELEASE_SVN_HUSKY.textproto @@ -1,4 +1,4 @@ name: "RELEASE_SVN_HUSKY" value: { - string_value: "41" + string_value: "42" } diff --git a/release/flag_values/ap3a/RELEASE_SVN_KOMODO.textproto b/release/flag_values/ap4a/RELEASE_SVN_KOMODO.textproto similarity index 64% rename from release/flag_values/ap3a/RELEASE_SVN_KOMODO.textproto rename to release/flag_values/ap4a/RELEASE_SVN_KOMODO.textproto index 64a57059..35ff7e79 100644 --- a/release/flag_values/ap3a/RELEASE_SVN_KOMODO.textproto +++ b/release/flag_values/ap4a/RELEASE_SVN_KOMODO.textproto @@ -1,4 +1,4 @@ name: "RELEASE_SVN_KOMODO" value: { - string_value: "08" + string_value: "09" } diff --git a/release/flag_values/ap3a/RELEASE_SVN_LYNX.textproto b/release/flag_values/ap4a/RELEASE_SVN_LYNX.textproto similarity index 63% rename from release/flag_values/ap3a/RELEASE_SVN_LYNX.textproto rename to release/flag_values/ap4a/RELEASE_SVN_LYNX.textproto index 459ffa71..561daaeb 100644 --- a/release/flag_values/ap3a/RELEASE_SVN_LYNX.textproto +++ b/release/flag_values/ap4a/RELEASE_SVN_LYNX.textproto @@ -1,4 +1,4 @@ name: "RELEASE_SVN_LYNX" value: { - string_value: "49" + string_value: "50" } diff --git a/release/flag_values/ap3a/RELEASE_SVN_ORIOLE.textproto b/release/flag_values/ap4a/RELEASE_SVN_ORIOLE.textproto similarity index 64% rename from release/flag_values/ap3a/RELEASE_SVN_ORIOLE.textproto rename to release/flag_values/ap4a/RELEASE_SVN_ORIOLE.textproto index 0232d69d..7022984f 100644 --- a/release/flag_values/ap3a/RELEASE_SVN_ORIOLE.textproto +++ b/release/flag_values/ap4a/RELEASE_SVN_ORIOLE.textproto @@ -1,4 +1,4 @@ name: "RELEASE_SVN_ORIOLE" value: { - string_value: "89" + string_value: "90" } diff --git a/release/flag_values/ap3a/RELEASE_SVN_PANTHER.textproto b/release/flag_values/ap4a/RELEASE_SVN_PANTHER.textproto similarity index 65% rename from release/flag_values/ap3a/RELEASE_SVN_PANTHER.textproto rename to release/flag_values/ap4a/RELEASE_SVN_PANTHER.textproto index 94088d8b..cebabb4a 100644 --- a/release/flag_values/ap3a/RELEASE_SVN_PANTHER.textproto +++ b/release/flag_values/ap4a/RELEASE_SVN_PANTHER.textproto @@ -1,4 +1,4 @@ name: "RELEASE_SVN_PANTHER" value: { - string_value: "64" + string_value: "65" } diff --git a/release/flag_values/ap3a/RELEASE_SVN_RAVEN.textproto b/release/flag_values/ap4a/RELEASE_SVN_RAVEN.textproto similarity index 63% rename from release/flag_values/ap3a/RELEASE_SVN_RAVEN.textproto rename to release/flag_values/ap4a/RELEASE_SVN_RAVEN.textproto index 6be3437a..d70291c9 100644 --- a/release/flag_values/ap3a/RELEASE_SVN_RAVEN.textproto +++ b/release/flag_values/ap4a/RELEASE_SVN_RAVEN.textproto @@ -1,4 +1,4 @@ name: "RELEASE_SVN_RAVEN" value: { - string_value: "89" + string_value: "90" } diff --git a/release/flag_values/ap3a/RELEASE_SVN_SHIBA.textproto b/release/flag_values/ap4a/RELEASE_SVN_SHIBA.textproto similarity index 63% rename from release/flag_values/ap3a/RELEASE_SVN_SHIBA.textproto rename to release/flag_values/ap4a/RELEASE_SVN_SHIBA.textproto index a6b310e9..5b694100 100644 --- a/release/flag_values/ap3a/RELEASE_SVN_SHIBA.textproto +++ b/release/flag_values/ap4a/RELEASE_SVN_SHIBA.textproto @@ -1,4 +1,4 @@ name: "RELEASE_SVN_SHIBA" value: { - string_value: "41" + string_value: "42" } diff --git a/release/flag_values/ap3a/RELEASE_SVN_TOKAY.textproto b/release/flag_values/ap4a/RELEASE_SVN_TOKAY.textproto similarity index 63% rename from release/flag_values/ap3a/RELEASE_SVN_TOKAY.textproto rename to release/flag_values/ap4a/RELEASE_SVN_TOKAY.textproto index 628bcf3a..36fba678 100644 --- a/release/flag_values/ap3a/RELEASE_SVN_TOKAY.textproto +++ b/release/flag_values/ap4a/RELEASE_SVN_TOKAY.textproto @@ -1,4 +1,4 @@ name: "RELEASE_SVN_TOKAY" value: { - string_value: "08" + string_value: "10" } diff --git a/release/release_config_map.mk b/release/release_config_map.mk index 5c3bdae3..4d3868f6 100644 --- a/release/release_config_map.mk +++ b/release/release_config_map.mk @@ -17,6 +17,6 @@ local_dir := $(dir $(lastword $(MAKEFILE_LIST))) # Attach the flag value definitions to the various release configurations. -$(call declare-release-config, ap3a, $(local_dir)build_config/ap3a.scl) +$(call declare-release-config, ap4a, $(local_dir)build_config/ap4a.scl) local_dir := diff --git a/release/release_config_map.textproto b/release/release_config_map.textproto index 905185b7..41f92287 100644 --- a/release/release_config_map.textproto +++ b/release/release_config_map.textproto @@ -4,11 +4,11 @@ default_containers: "system_ext" default_containers: "vendor" release_config { - name: "ap3a" - flag_value_files: "release_configs/ap3a.textproto" + name: "ap4a" + flag_value_files: "release_configs/ap4a.textproto" } build_config { - name: "ap3a" - flag_value_files: "build_config/ap3a.textproto" + name: "ap4a" + flag_value_files: "build_config/ap4a.textproto" } diff --git a/release/release_configs/ap3a.textproto b/release/release_configs/ap3a.textproto deleted file mode 100644 index f2049849..00000000 --- a/release/release_configs/ap3a.textproto +++ /dev/null @@ -1,3 +0,0 @@ -name: "ap3a" -prior_stages: "trunk" -aconfig_value_sets: "aconfig_value_set-lineage-ap3a" diff --git a/release/release_configs/ap4a.textproto b/release/release_configs/ap4a.textproto new file mode 100644 index 00000000..7c048296 --- /dev/null +++ b/release/release_configs/ap4a.textproto @@ -0,0 +1,3 @@ +name: "ap4a" +prior_stages: "trunk" +aconfig_value_sets: "aconfig_value_set-lineage-ap4a"