From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Thu, 4 Oct 2018 06:45:27 +0000 (+0800)
Subject: Use packages.mk from the product dir if exists
X-Git-Tag: android-x86-7.1-r3~27
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevice-generic-common.git;a=commitdiff_plain;h=ceb452f9ba1574090a6a8a45e60798b331bdb43e;hp=211335900dfb28f2f1af8590af905f2a97b794c5

Use packages.mk from the product dir if exists
---

diff --git a/device.mk b/device.mk
index 3764464..da1b830 100644
--- 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
--- 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)