diff options
| author | Alfred Piccioni <alpic@google.com> | 2023-06-21 17:30:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-21 17:30:10 +0000 |
| commit | 2ba77c1c5ec404ef47137f5b459197e87dbc3ce9 (patch) | |
| tree | 27d962b3720d9a3afb04d0f8f745f49a28c0ccca /shared/camera | |
| parent | ccc5d53845557416114201708e3a78b3db035f28 (diff) | |
| parent | 4004f271e776dae8c7baaed74cf24acc63be404c (diff) | |
| download | cuttlefish-2ba77c1c5ec404ef47137f5b459197e87dbc3ce9.tar.gz | |
Merge "Remove camera configs for TV Cuttlefish" am: 7d94dcde87 am: d25e324384 am: 4004f271e7
Original change: https://android-review.googlesource.com/c/device/google/cuttlefish/+/2628158
Change-Id: I0eb78039292b9fa639b9d21a9be68a6c84db9600
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'shared/camera')
| -rw-r--r-- | shared/camera/device_vendor.mk | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/shared/camera/device_vendor.mk b/shared/camera/device_vendor.mk index 93dda4a92..854d13b5b 100644 --- a/shared/camera/device_vendor.mk +++ b/shared/camera/device_vendor.mk @@ -42,9 +42,16 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.camera.front.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.front.xml \ frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml \ frameworks/native/data/etc/android.hardware.camera.raw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.raw.xml \ - hardware/google/camera/devices/EmulatedCamera/hwl/configs/emu_camera_back.json:$(TARGET_COPY_OUT_VENDOR)/etc/config/emu_camera_back.json \ - hardware/google/camera/devices/EmulatedCamera/hwl/configs/emu_camera_front.json:$(TARGET_COPY_OUT_VENDOR)/etc/config/emu_camera_front.json \ - hardware/google/camera/devices/EmulatedCamera/hwl/configs/emu_camera_depth.json:$(TARGET_COPY_OUT_VENDOR)/etc/config/emu_camera_depth.json + +ifeq ($(PRODUCT_IS_ATV_CF),true) + PRODUCT_COPY_FILES += \ + hardware/google/camera/devices/EmulatedCamera/hwl/configs/emu_camera_front.json:$(TARGET_COPY_OUT_VENDOR)/etc/config/emu_camera_front.json +else + PRODUCT_COPY_FILES += \ + hardware/google/camera/devices/EmulatedCamera/hwl/configs/emu_camera_back.json:$(TARGET_COPY_OUT_VENDOR)/etc/config/emu_camera_back.json \ + hardware/google/camera/devices/EmulatedCamera/hwl/configs/emu_camera_front.json:$(TARGET_COPY_OUT_VENDOR)/etc/config/emu_camera_front.json \ + hardware/google/camera/devices/EmulatedCamera/hwl/configs/emu_camera_depth.json:$(TARGET_COPY_OUT_VENDOR)/etc/config/emu_camera_depth.json +endif ifeq ($(TARGET_USE_VSOCK_CAMERA_HAL_IMPL),true) PRODUCT_PACKAGES += \ |