Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9990350c authored by Ján Sebechlebský's avatar Ján Sebechlebský Committed by Android (Google) Code Review
Browse files

Merge "Move virtual_camera_service_discovery to virtual_devices namespace" into main

parents 0864752e 3aec7f17
Loading
Loading
Loading
Loading
+17 −0
Original line number Diff line number Diff line
@@ -265,6 +265,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",
+9 −0
Original line number Diff line number Diff line
# 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 {
+23 −0
Original line number Diff line number Diff line
#
# 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"
}