config: Move the inclusion of CM specific stuff to prevent overriding

diff --git a/device.mk b/device.mk
index 4fca9f7..f81ebe4 100644 (file)
--- a/device.mk
+++ b/device.mk
@@ -106,3 +106,6 @@ $(call inherit-product-if-exists,vendor/google/products/gms.mk)
 
 # Get native bridge settings
 $(call inherit-product-if-exists,$(LOCAL_PATH)/nativebridge/nativebridge.mk)
+
+# Inherit some common CM stuff.
+$(call inherit-product, vendor/cm/config/common_full_phone.mk)

diff --git a/x86.mk b/x86.mk
index 3c890b2..2c94d1f 100644 (file)
--- a/x86.mk
+++ b/x86.mk
@@ -17,9 +17,6 @@
 # This is a generic product that isn't specialized for a specific device.
 # It includes the base Android-x86 platform.
 
-# Inherit some common CM stuff.
-$(call inherit-product, vendor/cm/config/common_full_phone.mk)
-
 # Additional settings used in all AOSP builds
 PRODUCT_PROPERTY_OVERRIDES := \
     ro.com.android.dateformat=MM-dd-yyyy \