From 0612158699ad8f7930266a3049d7e80b48ff2ed0 Mon Sep 17 00:00:00 2001 From: danielml Date: Mon, 8 Apr 2024 10:56:06 +0200 Subject: [PATCH] lineage: Add aconfig flags extension for AP1A Our ap1a.scl extends build/release's ap1a.scl to include our aconfig value set. Change-Id: I76c4eceaa1d37f479bd53922766175832d3abb5f Signed-off-by: danielml --- release/aconfig/ap1a/Android.bp | 21 +++++++++++++++++ .../Android.bp | 22 ++++++++++++++++++ ...r_info_media_manager_flag_values.textproto | 6 +++++ release/build_config/ap1a.scl | 23 +++++++++++++++++++ release/release_config_map.mk | 22 ++++++++++++++++++ 5 files changed, 94 insertions(+) create mode 100644 release/aconfig/ap1a/Android.bp create mode 100644 release/aconfig/ap1a/com.android.settingslib.media.flags/Android.bp create mode 100644 release/aconfig/ap1a/com.android.settingslib.media.flags/use_media_router2_for_info_media_manager_flag_values.textproto create mode 100644 release/build_config/ap1a.scl create mode 100644 release/release_config_map.mk diff --git a/release/aconfig/ap1a/Android.bp b/release/aconfig/ap1a/Android.bp new file mode 100644 index 00000000..e0031f23 --- /dev/null +++ b/release/aconfig/ap1a/Android.bp @@ -0,0 +1,21 @@ +// +// 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. + +aconfig_value_set { + name: "aconfig_value_set-lineage-ap1a", + values: [ + "aconfig-values-ap1a-com.android.settingslib.media.flags-all", + ], +} diff --git a/release/aconfig/ap1a/com.android.settingslib.media.flags/Android.bp b/release/aconfig/ap1a/com.android.settingslib.media.flags/Android.bp new file mode 100644 index 00000000..9b298652 --- /dev/null +++ b/release/aconfig/ap1a/com.android.settingslib.media.flags/Android.bp @@ -0,0 +1,22 @@ +// +// 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-ap1a-com.android.settingslib.media.flags-all", + package: "com.android.settingslib.media.flags", + srcs: [ + "*_flag_values.textproto", + ], +} diff --git a/release/aconfig/ap1a/com.android.settingslib.media.flags/use_media_router2_for_info_media_manager_flag_values.textproto b/release/aconfig/ap1a/com.android.settingslib.media.flags/use_media_router2_for_info_media_manager_flag_values.textproto new file mode 100644 index 00000000..01535a2e --- /dev/null +++ b/release/aconfig/ap1a/com.android.settingslib.media.flags/use_media_router2_for_info_media_manager_flag_values.textproto @@ -0,0 +1,6 @@ +flag_value { + package: "com.android.settingslib.media.flags" + name: "use_media_router2_for_info_media_manager" + state: ENABLED + permission: READ_WRITE +} diff --git a/release/build_config/ap1a.scl b/release/build_config/ap1a.scl new file mode 100644 index 00000000..8ec3eba2 --- /dev/null +++ b/release/build_config/ap1a.scl @@ -0,0 +1,23 @@ +# +# 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-ap1a"), + # keep-sorted end +] diff --git a/release/release_config_map.mk b/release/release_config_map.mk new file mode 100644 index 00000000..48c4465a --- /dev/null +++ b/release/release_config_map.mk @@ -0,0 +1,22 @@ +# +# 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. + +# Get the directory for this file, and use that instead of a fixed path. +local_dir := $(dir $(lastword $(MAKEFILE_LIST))) + +# Attach the flag value definitions to the various release configurations. +$(call declare-release-config, ap1a, $(local_dir)build_config/ap1a.scl) + +local_dir :=