Evolution-X-Tensor/device_google_gs-common
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Remove PRODUCT_COPY_FILES from lyric.mk." into udc-d1-dev am: d91664349a

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/23017150

Change-Id: Ie9845fd18bc93d1f63c7aacf58e92b0818c14e78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Krzysztof Kosiński 2023-05-05 08:34:38 +00:00 • committed by Automerger Merge Worker
commit 64152ef8fa
3 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
camera/Android.bp
View file

@ -18,3 +18,11 @@ cc_binary {
vendor: true, vendor: true,
relative_install_path: "dump", relative_install_path: "dump",
} }
prebuilt_etc {
name: "lyric_preview_dis_xml",
vendor: true,
filename: "vendor.android.hardware.camera.preview-dis.xml",
src: "vendor.android.hardware.camera.preview-dis.xml",
sub_dir: "permissions",
}

9
camera/lyric.mk
View file

@ -39,12 +39,6 @@ PRODUCT_SOONG_NAMESPACES += \
# Calibration tool for debug builds # Calibration tool for debug builds
PRODUCT_PACKAGES_DEBUG += tarasque_test PRODUCT_PACKAGES_DEBUG += tarasque_test
# dualcamcapture only works for GMS build. Only enable this apk for GMS userdebug/eng builds
ifeq (,$(filter aosp_% factory_%,$(TARGET_PRODUCT)))
PRODUCT_PACKAGES_DEBUG += dualcamcapture
PRODUCT_COPY_FILES += vendor/google/camera/devices/whi/preinstalled-packages-product-camera-device-vendor-debug.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/preinstalled-packages-product-camera-device-vendor-debug.xml
endif
endif # vendor/google/camera check endif # vendor/google/camera check
# Init-time log settings for Google 3A # Init-time log settings for Google 3A
@ -55,8 +49,7 @@ PRODUCT_PACKAGES += libg3a_standalone_ghawb_rc
# Vendor APEX which contains the camera HAL # Vendor APEX which contains the camera HAL
PRODUCT_PACKAGES += com.google.pixel.camera.hal PRODUCT_PACKAGES += com.google.pixel.camera.hal
PRODUCT_PACKAGES += init.camera.set-interrupts-ownership PRODUCT_PACKAGES += init.camera.set-interrupts-ownership
PRODUCT_PACKAGES += lyric_preview_dis_xml
# sepolicy dir is added in dump.mk. # sepolicy dir is added in dump.mk.
# Make doesn't deduplicate sepolicy dirs, so including it here causes build errors. # Make doesn't deduplicate sepolicy dirs, so including it here causes build errors.
PRODUCT_COPY_FILES += vendor/google/services/LyricCameraHAL/src/vendor.android.hardware.camera.preview-dis.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/vendor.android.hardware.camera.preview-dis.xml

8
camera/vendor.android.hardware.camera.preview-dis.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This is to advertise that the camera device supports preview digital image stabilization
in both front and back cameras-->
<permissions>
<feature name="vendor.android.hardware.camera.preview-dis.front" />
<feature name="vendor.android.hardware.camera.preview-dis.back" />
</permissions>