omni: use DEVICE_PACKAGE_OVERLAYS for proper layering of overlays
Change-Id: I1cbe0704471d8d2ca0675e0ed861251a41a91ec7
diff --git a/config/common.mk b/config/common.mk
index 3d62d91..0bc4fed 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -94,7 +94,7 @@
-include vendor/omni/config/version.mk
# Add our overlays
-PRODUCT_PACKAGE_OVERLAYS += vendor/omni/overlay/common
+DEVICE_PACKAGE_OVERLAYS += vendor/omni/overlay/common
# Enable dexpreopt for all nightlies
ifeq ($(ROM_BUILDTYPE),NIGHTLY)
diff --git a/config/common_tablet.mk b/config/common_tablet.mk
index 829bfa1..a1f27f0 100644
--- a/config/common_tablet.mk
+++ b/config/common_tablet.mk
@@ -2,7 +2,7 @@
-include vendor/omni/config/common.mk
# Add tablet overlays
-PRODUCT_PACKAGE_OVERLAYS += vendor/omni/overlay/common_tablet
+DEVICE_PACKAGE_OVERLAYS += vendor/omni/overlay/common_tablet
PRODUCT_CHARACTERISTICS := tablet
diff --git a/utils/emulator/common.mk b/utils/emulator/common.mk
index 5949d9d..11c725c 100644
--- a/utils/emulator/common.mk
+++ b/utils/emulator/common.mk
@@ -70,6 +70,6 @@
-include vendor/omni/config/version.mk
# Add our overlays
-PRODUCT_PACKAGE_OVERLAYS += vendor/omni/overlay/common
+DEVICE_PACKAGE_OVERLAYS += vendor/omni/overlay/common
WITH_DEXPREOPT := false
diff --git a/utils/emulator/omni_emulator.mk b/utils/emulator/omni_emulator.mk
index 6b2a51f..c86e252 100644
--- a/utils/emulator/omni_emulator.mk
+++ b/utils/emulator/omni_emulator.mk
@@ -10,4 +10,4 @@
# Override product naming for Omni
PRODUCT_NAME := omni_emulator
-PRODUCT_PACKAGE_OVERLAYS += vendor/omni/utils/emulator/overlay
+DEVICE_PACKAGE_OVERLAYS += vendor/omni/utils/emulator/overlay