Now overlays are done as RRO. DEVICE overlay will be in /vendor/overlay which we dont control. Change this to PRODUCT overlay so our overlay is taken into account

This commit is contained in:
Pierre-Hugues Husson 2020-09-27 19:55:55 +02:00
parent 1c3f1d6e4e
commit 8bbe19ca57
2 changed files with 2 additions and 2 deletions

View File

@ -12,7 +12,7 @@ PRODUCT_COPY_FILES += \
device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
BOARD_PLAT_PRIVATE_SEPOLICY_DIR += device/phh/treble/sepolicy BOARD_PLAT_PRIVATE_SEPOLICY_DIR += device/phh/treble/sepolicy
DEVICE_PACKAGE_OVERLAYS += device/phh/treble/overlay PRODUCT_PACKAGE_OVERLAYS += device/phh/treble/overlay
$(call inherit-product, vendor/hardware_overlay/overlay.mk) $(call inherit-product, vendor/hardware_overlay/overlay.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)

View File

@ -22,7 +22,7 @@ PRODUCT_COPY_FILES += \
device/phh/treble/empty-permission.xml:system/etc/permissions/com.google.android.camera.experimental2016.xml \ device/phh/treble/empty-permission.xml:system/etc/permissions/com.google.android.camera.experimental2016.xml \
device/phh/treble/empty-permission.xml:system/etc/permissions/com.google.android.camera.experimental2017.xml device/phh/treble/empty-permission.xml:system/etc/permissions/com.google.android.camera.experimental2017.xml
DEVICE_PACKAGE_OVERLAYS += device/phh/treble/overlay-gapps PRODUCT_PACKAGE_OVERLAYS += device/phh/treble/overlay-gapps
GAPPS_VARIANT := pico GAPPS_VARIANT := pico
DONT_DEXPREOPT_PREBUILTS := true DONT_DEXPREOPT_PREBUILTS := true
WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true