From 3aec7f1706224cc6bb6e995f443b9a75f0c62af7 Mon Sep 17 00:00:00 2001
From: Jan Sebechlebsky <jsebechlebsky@google.com>
Date: Fri, 17 Nov 2023 16:05:41 +0100
Subject: [PATCH] Move virtual_camera_service_discovery to virtual_devices
namespace
... and config owned by Virtual Device Manager team.
This cl creates new flags.aconfig since the previously used
core/java/android/companion/virtual/flags.aconfig has package
which contains "virtual" C++ keyword so it's not possible to
add cc target due to compilation error in autogenerated code.
Bug: 311459626
Test: atest CameraProviderManagerTest
Change-Id: Id7c60cf4b1eaed2a9b65bcb34f193cab05639953
---
AconfigFlags.bp | 17 ++++++++++++++
.../android/companion/virtual/flags.aconfig | 9 ++++++++
.../companion/virtual/flags/flags.aconfig | 23 +++++++++++++++++++
3 files changed, 49 insertions(+)
create mode 100644 core/java/android/companion/virtual/flags/flags.aconfig
diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index b5f398b28b9e..501277eed0ed 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -263,6 +263,23 @@ java_aconfig_library {
}
// VirtualDeviceManager
+cc_aconfig_library {
+ name: "android.companion.virtualdevice.flags-aconfig-cc",
+ aconfig_declarations: "android.companion.virtualdevice.flags-aconfig",
+}
+
+java_aconfig_library {
+ name: "android.companion.virtualdevice.flags-aconfig-java",
+ aconfig_declarations: "android.companion.virtualdevice.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+aconfig_declarations {
+ name: "android.companion.virtualdevice.flags-aconfig",
+ package: "android.companion.virtualdevice.flags",
+ srcs: ["core/java/android/companion/virtual/flags/*.aconfig"],
+}
+
java_aconfig_library {
name: "android.companion.virtual.flags-aconfig-java",
aconfig_declarations: "android.companion.virtual.flags-aconfig",
diff --git a/core/java/android/companion/virtual/flags.aconfig b/core/java/android/companion/virtual/flags.aconfig
index 02066fa8a34e..10da8b1c8203 100644
--- a/core/java/android/companion/virtual/flags.aconfig
+++ b/core/java/android/companion/virtual/flags.aconfig
@@ -1,3 +1,12 @@
+# Do not add new flags to this file.
+#
+# Due to "virtual" keyword in the package name flags
+# added to this file cannot be accessed from C++
+# code.
+#
+# Use frameworks/base/core/java/android/companion/virtual/flags/flags.aconfig
+# instead.
+
package: "android.companion.virtual.flags"
flag {
diff --git a/core/java/android/companion/virtual/flags/flags.aconfig b/core/java/android/companion/virtual/flags/flags.aconfig
new file mode 100644
index 000000000000..d26890faee79
--- /dev/null
+++ b/core/java/android/companion/virtual/flags/flags.aconfig
@@ -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.
+
+package: "android.companion.virtualdevice.flags"
+
+flag {
+ namespace: "virtual_devices"
+ name: "virtual_camera_service_discovery"
+ description: "Enable discovery of the Virtual Camera HAL without a VINTF entry"
+ bug: "305170199"
+}
--
GitLab