[automerger skipped] SIGKILL crosvm since `crosvm stop` may be slow am: 04d54622b5 am: d36afe242b am: 84c6deeb84 -s ours am: dececd25f7 -s ours am: e142966055 -s ours am: 408234c9ad -s ours am: e47a25756d -s ours
am skip reason: Merged-In Iec376c1bb02c98dd32ff869c708cace40ad86ff9 with SHA-1 004598c980 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/23753685
Change-Id: I8e00105cb3d8b03e731e0738b59009c31e6374a8
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/shared/camera/device_vendor.mk b/shared/camera/device_vendor.mk
index 93dda4a..b5904d9 100644
--- a/shared/camera/device_vendor.mk
+++ b/shared/camera/device_vendor.mk
@@ -32,10 +32,18 @@
# TODO(b/257379485): 3A is incrementally enabling cuttlefish build for native
# code coverage support, temporary require separate namespace for folders that
# can be built successfully.
+PRODUCT_SOONG_NAMESPACES += vendor/google/camera/common/g3_shared
PRODUCT_SOONG_NAMESPACES += vendor/google/camera/google_3a/libs_v4/g3ABase
+PRODUCT_SOONG_NAMESPACES += vendor/google/camera/google_3a/libs_v4/gABC/native_coverage
PRODUCT_SOONG_NAMESPACES += vendor/google/camera/google_3a/libs_v4/gAF
+PRODUCT_SOONG_NAMESPACES += vendor/google/camera/google_3a/libs_v4/gafd
PRODUCT_SOONG_NAMESPACES += vendor/google/camera/google_3a/libs_v4/gHAWB/native_coverage
+# go/lyric-soong-variables
+$(call soong_config_set,lyric,camera_hardware,cuttlefish)
+$(call soong_config_set,lyric,tuning_product,cuttlefish)
+$(call soong_config_set,google3a_config,target_device,cuttlefish)
+
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.camera.concurrent.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.concurrent.xml \
frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.flash-autofocus.xml \
