universal7885: Fixup merge errors

This commit is contained in:
roynatech2544 2021-10-31 20:51:11 +09:00
commit 93778fc639
No known key found for this signature in database
GPG key ID: 9675C32163D88D30
7 changed files with 122 additions and 21 deletions

View file

@ -124,9 +124,6 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
android.hardware.keymaster@4.0-service.samsung \
libkeymaster4_1support.vendor
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/configs/android.hardware.keymaster@4.0-service.samsung.xml:$(TARGET_COPY_OUT_VENDOR)/etc/vintf/manifest/android.hardware.keymaster@4.0-service.samsung.xml
# Light
PRODUCT_PACKAGES += \