Use packages.mk from the product dir if exists

diff --git a/device.mk b/device.mk
index 3764464..da1b830 100644 (file)
--- a/device.mk
+++ b/device.mk
@@ -111,3 +111,5 @@ $(call inherit-product-if-exists,vendor/google/products/gms.mk)
 
 # Get native bridge settings
 $(call inherit-product-if-exists,$(LOCAL_PATH)/nativebridge/nativebridge.mk)
+
+$(call inherit-product,$(if $(wildcard $(PRODUCT_DIR)packages.mk),$(PRODUCT_DIR),$(LOCAL_PATH)/)packages.mk)

diff --git a/x86.mk b/x86.mk
index 2c94d1f..6c3ec66 100644 (file)
--- a/x86.mk
+++ b/x86.mk
@@ -22,7 +22,6 @@ PRODUCT_PROPERTY_OVERRIDES := \
     ro.com.android.dateformat=MM-dd-yyyy \
 
 $(call inherit-product,$(LOCAL_PATH)/device.mk)
-$(call inherit-product,$(LOCAL_PATH)/packages.mk)
 
 # Get a list of languages.
 $(call inherit-product,$(SRC_TARGET_DIR)/product/locales_full.mk)