Skip to content
Snippets Groups Projects
Commit 3aec7f17 authored by Jan Sebechlebsky's avatar Jan Sebechlebsky
Browse files

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
parent d90c2784
No related branches found
No related tags found
No related merge requests found
......@@ -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",
......
# 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 {
......
#
# 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"
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment