summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ian Kasprzak <iankaz@google.com> 2025-05-07 14:59:01 +0000
committer Ian Kasprzak <iankaz@google.com> 2025-05-07 14:59:01 +0000
commite1003b0b091c2c8dc501ee7add5319d50c1d30e7 (patch)
treecccfdd822803c313d24b22e95730673b801e1144
parentad4a93908d9dfc7ea71c85d7439ca8a125f3dc69 (diff)
Delete trunk_staging as this config is not supported for AOSP releases.
Bug: b/415779582 Change-Id: I85e36c4e4f3dc00231c0de3ad940827f00f9b1f5
-rw-r--r--automotive/aconfig/trunk_staging/Android.bp20
-rw-r--r--automotive/aconfig/trunk_staging/android.car.feature/Android.bp21
-rw-r--r--automotive/aconfig/trunk_staging/android.car.feature/always_send_initial_value_event_flag_values.textproto6
-rw-r--r--automotive/aconfig/trunk_staging/android.car.feature/async_audio_service_init_flag_values.textproto6
-rw-r--r--automotive/aconfig/trunk_staging/android.car.feature/audio_control_hal_configuration_flag_values.textproto6
-rw-r--r--automotive/aconfig/trunk_staging/android.car.feature/car_media_apps_suspension_flag_values.textproto6
-rw-r--r--automotive/aconfig/trunk_staging/android.car.feature/car_power_cancel_shell_command_flag_values.textproto6
-rw-r--r--automotive/aconfig/trunk_staging/android.car.feature/car_property_simulation_flag_values.textproto6
-rw-r--r--automotive/aconfig/trunk_staging/android.car.feature/car_property_supported_value_flag_values.textproto6
-rw-r--r--automotive/aconfig/trunk_staging/android.car.feature/car_watchdog_anr_metrics_flag_values.textproto6
-rw-r--r--automotive/aconfig/trunk_staging/android.car.feature/change_swaps_during_suspend_to_disk_flag_values.textproto6
-rw-r--r--automotive/aconfig/trunk_staging/android.car.feature/create_car_use_notifications_flag_values.textproto6
-rw-r--r--automotive/aconfig/trunk_staging/android.car.feature/display_compatibility_caption_bar_flag_values.textproto6
-rw-r--r--automotive/aconfig/trunk_staging/android.car.feature/display_compatibility_density_flag_values.textproto6
-rw-r--r--automotive/aconfig/trunk_staging/android.car.feature/handle_property_events_in_binder_thread_flag_values.textproto6
-rw-r--r--automotive/aconfig/trunk_staging/android.car.feature/native_power_notifications_flag_values.textproto6
-rw-r--r--automotive/aconfig/trunk_staging/android.car.feature/stop_process_before_suspend_to_disk_flag_values.textproto6
-rw-r--r--automotive/aconfig/trunk_staging/com.android.car.carlauncher/Android.bp21
-rw-r--r--automotive/aconfig/trunk_staging/com.android.car.carlauncher/media_card_fullscreen_flag_values.textproto7
-rw-r--r--automotive/aconfig/trunk_staging/com.android.car.carlauncher/tos_restrictions_enabled_flag_values.textproto6
-rw-r--r--automotive/aconfig/trunk_staging/com.android.systemui.car/Android.bp21
-rw-r--r--automotive/aconfig/trunk_staging/com.android.systemui.car/display_compatibility_caption_bar_flag_values.textproto6
-rw-r--r--automotive/flag_values/trunk_staging/RELEASE_CAR_SYS_EXP_TOS_RESTRICTIONS.textproto4
-rw-r--r--automotive/flag_values/trunk_staging/RELEASE_FRAMEWORK_NATIVE_POWER_NOTIFICATIONS.textproto4
-rw-r--r--automotive/flag_values/trunk_staging/RELEASE_LANDSCAPE_SCALABLE_UI.textproto4
-rw-r--r--automotive/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION.textproto4
-rw-r--r--automotive/release_configs/trunk_staging.textproto3
27 files changed, 0 insertions, 211 deletions
diff --git a/automotive/aconfig/trunk_staging/Android.bp b/automotive/aconfig/trunk_staging/Android.bp
deleted file mode 100644
index d5eed4a4..00000000
--- a/automotive/aconfig/trunk_staging/Android.bp
+++ /dev/null
@@ -1,20 +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_value_set {
- name: "aconfig_value_set-platform_build_release_automotive-trunk_staging",
- srcs: [
- "*/Android.bp",
- ],
-}
diff --git a/automotive/aconfig/trunk_staging/android.car.feature/Android.bp b/automotive/aconfig/trunk_staging/android.car.feature/Android.bp
deleted file mode 100644
index b7914eda..00000000
--- a/automotive/aconfig/trunk_staging/android.car.feature/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-platform_build_release_automotive-trunk_staging-android.car.feature-all",
- package: "android.car.feature",
- srcs: [
- "*_flag_values.textproto",
- ],
-}
diff --git a/automotive/aconfig/trunk_staging/android.car.feature/always_send_initial_value_event_flag_values.textproto b/automotive/aconfig/trunk_staging/android.car.feature/always_send_initial_value_event_flag_values.textproto
deleted file mode 100644
index 3422cf1d..00000000
--- a/automotive/aconfig/trunk_staging/android.car.feature/always_send_initial_value_event_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
- package: "android.car.feature"
- name: "always_send_initial_value_event"
- state: ENABLED
- permission: READ_ONLY
-}
diff --git a/automotive/aconfig/trunk_staging/android.car.feature/async_audio_service_init_flag_values.textproto b/automotive/aconfig/trunk_staging/android.car.feature/async_audio_service_init_flag_values.textproto
deleted file mode 100644
index 7cb1be97..00000000
--- a/automotive/aconfig/trunk_staging/android.car.feature/async_audio_service_init_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
- package: "android.car.feature"
- name: "async_audio_service_init"
- state: ENABLED
- permission: READ_ONLY
-}
diff --git a/automotive/aconfig/trunk_staging/android.car.feature/audio_control_hal_configuration_flag_values.textproto b/automotive/aconfig/trunk_staging/android.car.feature/audio_control_hal_configuration_flag_values.textproto
deleted file mode 100644
index aec3e233..00000000
--- a/automotive/aconfig/trunk_staging/android.car.feature/audio_control_hal_configuration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
- package: "android.car.feature"
- name: "audio_control_hal_configuration"
- state: ENABLED
- permission: READ_ONLY
-}
diff --git a/automotive/aconfig/trunk_staging/android.car.feature/car_media_apps_suspension_flag_values.textproto b/automotive/aconfig/trunk_staging/android.car.feature/car_media_apps_suspension_flag_values.textproto
deleted file mode 100644
index 1595f19c..00000000
--- a/automotive/aconfig/trunk_staging/android.car.feature/car_media_apps_suspension_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
- package: "android.car.feature"
- name: "car_media_apps_suspension"
- state: ENABLED
- permission: READ_WRITE
-}
diff --git a/automotive/aconfig/trunk_staging/android.car.feature/car_power_cancel_shell_command_flag_values.textproto b/automotive/aconfig/trunk_staging/android.car.feature/car_power_cancel_shell_command_flag_values.textproto
deleted file mode 100644
index 203ef7eb..00000000
--- a/automotive/aconfig/trunk_staging/android.car.feature/car_power_cancel_shell_command_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
- package: "android.car.feature"
- name: "car_power_cancel_shell_command"
- state: ENABLED
- permission: READ_ONLY
-}
diff --git a/automotive/aconfig/trunk_staging/android.car.feature/car_property_simulation_flag_values.textproto b/automotive/aconfig/trunk_staging/android.car.feature/car_property_simulation_flag_values.textproto
deleted file mode 100644
index 2007affb..00000000
--- a/automotive/aconfig/trunk_staging/android.car.feature/car_property_simulation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
- package: "android.car.feature"
- name: "car_property_simulation"
- state: ENABLED
- permission: READ_ONLY
-}
diff --git a/automotive/aconfig/trunk_staging/android.car.feature/car_property_supported_value_flag_values.textproto b/automotive/aconfig/trunk_staging/android.car.feature/car_property_supported_value_flag_values.textproto
deleted file mode 100644
index 49e3682a..00000000
--- a/automotive/aconfig/trunk_staging/android.car.feature/car_property_supported_value_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
- package: "android.car.feature"
- name: "car_property_supported_value"
- state: ENABLED
- permission: READ_ONLY
-}
diff --git a/automotive/aconfig/trunk_staging/android.car.feature/car_watchdog_anr_metrics_flag_values.textproto b/automotive/aconfig/trunk_staging/android.car.feature/car_watchdog_anr_metrics_flag_values.textproto
deleted file mode 100644
index 8cf2405c..00000000
--- a/automotive/aconfig/trunk_staging/android.car.feature/car_watchdog_anr_metrics_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
- package: "android.car.feature"
- name: "car_watchdog_anr_metrics"
- state: ENABLED
- permission: READ_ONLY
-}
diff --git a/automotive/aconfig/trunk_staging/android.car.feature/change_swaps_during_suspend_to_disk_flag_values.textproto b/automotive/aconfig/trunk_staging/android.car.feature/change_swaps_during_suspend_to_disk_flag_values.textproto
deleted file mode 100644
index a6d250b7..00000000
--- a/automotive/aconfig/trunk_staging/android.car.feature/change_swaps_during_suspend_to_disk_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
- package: "android.car.feature"
- name: "change_swaps_during_suspend_to_disk"
- state: ENABLED
- permission: READ_ONLY
-}
diff --git a/automotive/aconfig/trunk_staging/android.car.feature/create_car_use_notifications_flag_values.textproto b/automotive/aconfig/trunk_staging/android.car.feature/create_car_use_notifications_flag_values.textproto
deleted file mode 100644
index 328fa0c5..00000000
--- a/automotive/aconfig/trunk_staging/android.car.feature/create_car_use_notifications_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
- package: "android.car.feature"
- name: "create_car_use_notifications"
- state: ENABLED
- permission: READ_ONLY
-}
diff --git a/automotive/aconfig/trunk_staging/android.car.feature/display_compatibility_caption_bar_flag_values.textproto b/automotive/aconfig/trunk_staging/android.car.feature/display_compatibility_caption_bar_flag_values.textproto
deleted file mode 100644
index a1796710..00000000
--- a/automotive/aconfig/trunk_staging/android.car.feature/display_compatibility_caption_bar_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
- package: "android.car.feature"
- name: "display_compatibility_caption_bar"
- state: ENABLED
- permission: READ_WRITE
-}
diff --git a/automotive/aconfig/trunk_staging/android.car.feature/display_compatibility_density_flag_values.textproto b/automotive/aconfig/trunk_staging/android.car.feature/display_compatibility_density_flag_values.textproto
deleted file mode 100644
index 91902eb7..00000000
--- a/automotive/aconfig/trunk_staging/android.car.feature/display_compatibility_density_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
- package: "android.car.feature"
- name: "display_compatibility_density"
- state: ENABLED
- permission: READ_WRITE
-}
diff --git a/automotive/aconfig/trunk_staging/android.car.feature/handle_property_events_in_binder_thread_flag_values.textproto b/automotive/aconfig/trunk_staging/android.car.feature/handle_property_events_in_binder_thread_flag_values.textproto
deleted file mode 100644
index 6517f808..00000000
--- a/automotive/aconfig/trunk_staging/android.car.feature/handle_property_events_in_binder_thread_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
- package: "android.car.feature"
- name: "handle_property_events_in_binder_thread"
- state: ENABLED
- permission: READ_ONLY
-}
diff --git a/automotive/aconfig/trunk_staging/android.car.feature/native_power_notifications_flag_values.textproto b/automotive/aconfig/trunk_staging/android.car.feature/native_power_notifications_flag_values.textproto
deleted file mode 100644
index 17fcde82..00000000
--- a/automotive/aconfig/trunk_staging/android.car.feature/native_power_notifications_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
- package: "android.car.feature"
- name: "native_power_notifications"
- state: ENABLED
- permission: READ_ONLY
-}
diff --git a/automotive/aconfig/trunk_staging/android.car.feature/stop_process_before_suspend_to_disk_flag_values.textproto b/automotive/aconfig/trunk_staging/android.car.feature/stop_process_before_suspend_to_disk_flag_values.textproto
deleted file mode 100644
index 2ffa972f..00000000
--- a/automotive/aconfig/trunk_staging/android.car.feature/stop_process_before_suspend_to_disk_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
- package: "android.car.feature"
- name: "stop_process_before_suspend_to_disk"
- state: ENABLED
- permission: READ_ONLY
-}
diff --git a/automotive/aconfig/trunk_staging/com.android.car.carlauncher/Android.bp b/automotive/aconfig/trunk_staging/com.android.car.carlauncher/Android.bp
deleted file mode 100644
index d7562765..00000000
--- a/automotive/aconfig/trunk_staging/com.android.car.carlauncher/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-platform_build_release_automotive-trunk_staging-com.android.car.carlauncher-all",
- package: "com.android.car.carlauncher",
- srcs: [
- "*_flag_values.textproto",
- ],
-}
diff --git a/automotive/aconfig/trunk_staging/com.android.car.carlauncher/media_card_fullscreen_flag_values.textproto b/automotive/aconfig/trunk_staging/com.android.car.carlauncher/media_card_fullscreen_flag_values.textproto
deleted file mode 100644
index f657dbf2..00000000
--- a/automotive/aconfig/trunk_staging/com.android.car.carlauncher/media_card_fullscreen_flag_values.textproto
+++ /dev/null
@@ -1,7 +0,0 @@
-flag_value {
- package: "com.android.car.carlauncher"
- name: "media_card_fullscreen"
- state: ENABLED
- permission: READ_WRITE
-}
-
diff --git a/automotive/aconfig/trunk_staging/com.android.car.carlauncher/tos_restrictions_enabled_flag_values.textproto b/automotive/aconfig/trunk_staging/com.android.car.carlauncher/tos_restrictions_enabled_flag_values.textproto
deleted file mode 100644
index 45d32ac5..00000000
--- a/automotive/aconfig/trunk_staging/com.android.car.carlauncher/tos_restrictions_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
- package: "com.android.car.carlauncher"
- name: "tos_restrictions_enabled"
- state: ENABLED
- permission: READ_WRITE
-} \ No newline at end of file
diff --git a/automotive/aconfig/trunk_staging/com.android.systemui.car/Android.bp b/automotive/aconfig/trunk_staging/com.android.systemui.car/Android.bp
deleted file mode 100644
index 3b6cc9c2..00000000
--- a/automotive/aconfig/trunk_staging/com.android.systemui.car/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-platform_build_release_automotive-trunk_staging-com.android.systemui.car-all",
- package: "com.android.systemui.car",
- srcs: [
- "*_flag_values.textproto",
- ],
-}
diff --git a/automotive/aconfig/trunk_staging/com.android.systemui.car/display_compatibility_caption_bar_flag_values.textproto b/automotive/aconfig/trunk_staging/com.android.systemui.car/display_compatibility_caption_bar_flag_values.textproto
deleted file mode 100644
index 2a7ef401..00000000
--- a/automotive/aconfig/trunk_staging/com.android.systemui.car/display_compatibility_caption_bar_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
- package: "com.android.systemui.car"
- name: "display_compatibility_caption_bar"
- state: ENABLED
- permission: READ_WRITE
-}
diff --git a/automotive/flag_values/trunk_staging/RELEASE_CAR_SYS_EXP_TOS_RESTRICTIONS.textproto b/automotive/flag_values/trunk_staging/RELEASE_CAR_SYS_EXP_TOS_RESTRICTIONS.textproto
deleted file mode 100644
index 83eb9578..00000000
--- a/automotive/flag_values/trunk_staging/RELEASE_CAR_SYS_EXP_TOS_RESTRICTIONS.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_CAR_SYS_EXP_TOS_RESTRICTIONS"
-value: {
- bool_value: true
-}
diff --git a/automotive/flag_values/trunk_staging/RELEASE_FRAMEWORK_NATIVE_POWER_NOTIFICATIONS.textproto b/automotive/flag_values/trunk_staging/RELEASE_FRAMEWORK_NATIVE_POWER_NOTIFICATIONS.textproto
deleted file mode 100644
index 7a543c2f..00000000
--- a/automotive/flag_values/trunk_staging/RELEASE_FRAMEWORK_NATIVE_POWER_NOTIFICATIONS.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_FRAMEWORK_NATIVE_POWER_NOTIFICATIONS"
-value: {
- bool_value: true
-}
diff --git a/automotive/flag_values/trunk_staging/RELEASE_LANDSCAPE_SCALABLE_UI.textproto b/automotive/flag_values/trunk_staging/RELEASE_LANDSCAPE_SCALABLE_UI.textproto
deleted file mode 100644
index e71bb4a6..00000000
--- a/automotive/flag_values/trunk_staging/RELEASE_LANDSCAPE_SCALABLE_UI.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_LANDSCAPE_SCALABLE_UI"
-value: {
- bool_value: true
-}
diff --git a/automotive/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION.textproto b/automotive/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION.textproto
deleted file mode 100644
index b6943148..00000000
--- a/automotive/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PLATFORM_VERSION"
-value: {
- string_value: "ZA1A"
-}
diff --git a/automotive/release_configs/trunk_staging.textproto b/automotive/release_configs/trunk_staging.textproto
deleted file mode 100644
index aa686a63..00000000
--- a/automotive/release_configs/trunk_staging.textproto
+++ /dev/null
@@ -1,3 +0,0 @@
-name: "trunk_staging"
-aconfig_value_sets: "aconfig_value_set-platform_build_release_automotive-trunk_staging"
-