Update for CM naming convention

diff --git a/android_x86.mk b/android_x86.mk
index fb7553a..6308ffb 100644 (file)
--- a/android_x86.mk
+++ b/android_x86.mk
@@ -18,7 +18,7 @@
 $(call inherit-product,device/generic/common/x86.mk)
 
 # Overrides
-PRODUCT_NAME := android_x86
+PRODUCT_NAME := cm_android_x86
 PRODUCT_BRAND := Android-x86
-PRODUCT_DEVICE := x86
+PRODUCT_DEVICE := android_x86
 PRODUCT_MODEL := Generic Android-x86

diff --git a/cm.mk b/cm.mk
new file mode 100644 (file)
index 0000000..28bd49e
--- /dev/null
+++ b/cm.mk
@@ -0,0 +1,5 @@
+# Release name
+PRODUCT_RELEASE_NAME := android_x86
+
+# Inherit device configuration
+$(call inherit-product, $(LOCAL_PATH)/android_x86.mk)

diff --git a/vendorsetup.sh b/vendorsetup.sh
index b13fa27..9764146 100644 (file)
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -20,6 +20,6 @@
 # In particular, you can add lunch options with the add_lunch_combo
 # function: add_lunch_combo generic-eng
 
-add_lunch_combo android_x86-eng
-add_lunch_combo android_x86-userdebug
-add_lunch_combo android_x86-user
+add_lunch_combo cm_android_x86-eng
+add_lunch_combo cm_android_x86-userdebug
+add_lunch_combo cm_android_x86-user