release: Bump aconfig flags extension to BP1A

Change-Id: I22f8426820c9a72ea05a2b89460484952b93043f

release/aconfig/ap4a/com.android.server.notification/Android.bp

@@ -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-ap4a-com.android.server.notification-all",
-  package: "com.android.server.notification",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}

release/aconfig/ap4a/com.android.server.notification/cross_app_polite_notifications_flag_values.textproto

@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "cross_app_polite_notifications"
-  state: ENABLED
-  permission: READ_WRITE
-}

release/aconfig/ap4a/com.android.server.notification/polite_notifications_attn_update_flag_values.textproto

@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "polite_notifications_attn_update"
-  state: ENABLED
-  permission: READ_WRITE
-}

release/aconfig/ap4a/com.android.server.notification/polite_notifications_flag_values.textproto

@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "polite_notifications"
-  state: ENABLED
-  permission: READ_WRITE
-}

release/aconfig/bp1a/Android.bp

@@ -14,9 +14,8 @@
 // limitations under the License.
 
 aconfig_value_set {
-    name: "aconfig_value_set-lineage-ap4a",
+    name: "aconfig_value_set-lineage-bp1a",
     values: [
-        "aconfig-values-ap4a-com.android.server.notification-all",
+        "aconfig-values-bp1a-com.android.window.flags-all",
-        "aconfig-values-ap4a-com.android.window.flags-all",
     ],
 }

release/aconfig/bp1a/com.android.window.flags/Android.bp

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-ap4a-com.android.window.flags-all",
+  name: "aconfig-values-bp1a-com.android.window.flags-all",
   package: "com.android.window.flags",
   srcs: [
     "*_flag_values.textproto",

release/aconfig/bp1a/com.android.window.flags/enable_desktop_windowing_mode_flag_values.textproto

@@ -2,5 +2,5 @@ flag_value {
   package: "com.android.window.flags"
   name: "enable_desktop_windowing_mode"
   state: ENABLED
-  permission: READ_WRITE
+  permission: READ_ONLY
 }

release/build_config/ap4a.scl

@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2024 The LineageOS 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.
-
-
-load("//build/make/core/release_config.scl", "value")
-
-values = [
-    # keep-sorted start numeric=yes
-    value("RELEASE_ACONFIG_VALUE_SETS", "aconfig_value_set-lineage-ap4a"),
-    # keep-sorted end
-]

release/build_config/bp1a.textproto

@@ -1,6 +1,6 @@
 values: [
     {
         name: "RELEASE_ACONFIG_VALUE_SETS"
-        value: "aconfig_value_set-lineage-ap4a"
+        value: "aconfig_value_set-lineage-bp1a"
     }
 ]

release/flag_declarations/Android.bp

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 build_flag_declarations {
-    name: "build_flags-build-release-calyx",
+    name: "build_flags-build-release-lineage",
     srcs: [
         "RELEASE_*.textproto",
     ],

release/flag_declarations/RELEASE_PIXEL_BROADCAST_ENABLED.textproto

@@ -1,11 +0,0 @@
-name: "RELEASE_PIXEL_BROADCAST_ENABLED"
-namespace: "android_UNKNOWN"
-description: "feature flag to enable broadcast feature for Pixel leading phone"
-value: {
-  bool_value: false
-}
-workflow: LAUNCH
-containers: "product"
-containers: "system"
-containers: "system_ext"
-containers: "vendor"

release/flag_values/ap4a/RELEASE_AVF_ENABLE_DICE_CHANGES.textproto

@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_DICE_CHANGES"
-value: {
-  bool_value: true
-}

release/flag_values/ap4a/RELEASE_AVF_ENABLE_LLPVM_CHANGES.textproto

@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_LLPVM_CHANGES"
-value: {
-  bool_value: true
-}

release/flag_values/ap4a/RELEASE_AVF_ENABLE_NETWORK.textproto

@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_NETWORK"
-value: {
-  bool_value: true
-}

release/flag_values/ap4a/RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES.textproto

@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES"
-value: {
-  bool_value: true
-}

release/flag_values/ap4a/RELEASE_PIXEL_BROADCAST_ENABLED.textproto

@@ -1,4 +0,0 @@
-name: "RELEASE_PIXEL_BROADCAST_ENABLED"
-value: {
-  bool_value: false
-}

release/flag_values/bp1a/RELEASE_GOOGLE_AKITA_16K_DEVELOPER_OPTION.textproto

@@ -0,0 +1,4 @@
+name: "RELEASE_GOOGLE_AKITA_16K_DEVELOPER_OPTION"
+value: {
+  bool_value: true
+}

release/flag_values/bp1a/RELEASE_PIXEL_AIDL_AUDIO_HAL_ZUMA.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_PIXEL_AIDL_AUDIO_HAL_ZUMA"
 value: {
-  bool_value: false
+  bool_value: true
 }

release/flag_values/bp1a/RELEASE_SVN_AKITA.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_AKITA"
 value: {
-  string_value: "28"
+  string_value: "32"
 }

release/flag_values/bp1a/RELEASE_SVN_BLUEJAY.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_BLUEJAY"
 value: {
-  string_value: "71"
+  string_value: "75"
 }

release/flag_values/bp1a/RELEASE_SVN_CAIMAN.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_CAIMAN"
 value: {
-  string_value: "12"
+  string_value: "18"
 }

release/flag_values/bp1a/RELEASE_SVN_CHEETAH.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_CHEETAH"
 value: {
-  string_value: "68"
+  string_value: "72"
 }

release/flag_values/bp1a/RELEASE_SVN_COMET.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_COMET"
 value: {
-  string_value: "12"
+  string_value: "18"
 }

release/flag_values/bp1a/RELEASE_SVN_FELIX.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_FELIX"
 value: {
-  string_value: "62"
+  string_value: "66"
 }

release/flag_values/bp1a/RELEASE_SVN_HUSKY.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_HUSKY"
 value: {
-  string_value: "45"
+  string_value: "49"
 }

release/flag_values/bp1a/RELEASE_SVN_KOMODO.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_KOMODO"
 value: {
-  string_value: "12"
+  string_value: "18"
 }

release/flag_values/bp1a/RELEASE_SVN_LYNX.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_LYNX"
 value: {
-  string_value: "53"
+  string_value: "57"
 }

release/flag_values/bp1a/RELEASE_SVN_ORIOLE.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_ORIOLE"
 value: {
-  string_value: "92"
+  string_value: "96"
 }

release/flag_values/bp1a/RELEASE_SVN_PANTHER.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_PANTHER"
 value: {
-  string_value: "68"
+  string_value: "72"
 }

release/flag_values/bp1a/RELEASE_SVN_RAVEN.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_RAVEN"
 value: {
-  string_value: "92"
+  string_value: "96"
 }

release/flag_values/bp1a/RELEASE_SVN_SHIBA.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_SHIBA"
 value: {
-  string_value: "45"
+  string_value: "49"
 }

release/flag_values/bp1a/RELEASE_SVN_TOKAY.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_TOKAY"
 value: {
-  string_value: "12"
+  string_value: "18"
 }

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, ap4a, $(local_dir)build_config/ap4a.scl)
+$(call declare-release-config, bp1a, $(local_dir)build_config/bp1a.scl)
 
 local_dir :=

release/release_config_map.textproto

@@ -4,11 +4,11 @@ default_containers: "system_ext"
 default_containers: "vendor"
 
 release_config {
-    name: "ap4a"
+    name: "bp1a"
-    flag_value_files: "release_configs/ap4a.textproto"
+    flag_value_files: "release_configs/bp1a.textproto"
 }
 
 build_config {
-    name: "ap4a"
+    name: "bp1a"
-    flag_value_files: "build_config/ap4a.textproto"
+    flag_value_files: "build_config/bp1a.textproto"
 }

release/release_configs/ap4a.textproto

@@ -1,3 +0,0 @@
-name: "ap4a"
-prior_stages: "trunk"
-aconfig_value_sets: "aconfig_value_set-lineage-ap4a"

release/release_configs/bp1a.textproto

@@ -0,0 +1,3 @@
+name: "bp1a"
+inherits: "ap4a"
+aconfig_value_sets: "aconfig_value_set-lineage-bp1a"