From 8bbe19ca57a9baec8f7c3437a21ab73eaee0b00c Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sun, 27 Sep 2020 19:55:55 +0200 Subject: [PATCH] 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 --- base.mk | 2 +- gapps.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base.mk b/base.mk index cad14e4..bfa93c7 100644 --- a/base.mk +++ b/base.mk @@ -12,7 +12,7 @@ PRODUCT_COPY_FILES += \ device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml 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, $(SRC_TARGET_DIR)/product/core_64_bit.mk) diff --git a/gapps.mk b/gapps.mk index e3039c3..cafb5e0 100644 --- a/gapps.mk +++ b/gapps.mk @@ -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.experimental2017.xml -DEVICE_PACKAGE_OVERLAYS += device/phh/treble/overlay-gapps +PRODUCT_PACKAGE_OVERLAYS += device/phh/treble/overlay-gapps GAPPS_VARIANT := pico DONT_DEXPREOPT_PREBUILTS := true WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true