From c6f7a490657c093acf82003dd2ff6854615152b3 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 28 Nov 2011 07:44:23 -0800
Subject: [PATCH] Remove common_versions.mk, and include it in common.mk. No
 reason to require inheritance from two product files.

Change-Id: If1a7835aca0832e41e664caed373707ce711f08a
---
 config/common.mk          | 22 +++++++++++++++++++++-
 config/common_versions.mk | 21 ---------------------
 2 files changed, 21 insertions(+), 22 deletions(-)
 delete mode 100644 config/common_versions.mk

diff --git a/config/common.mk b/config/common.mk
index 17c6c7c7..06c2a883 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -54,4 +54,24 @@ PRODUCT_PACKAGES += \
     MusicVisualization \
     PhaseBeam
 
-PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/dictionaries
\ No newline at end of file
+PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/dictionaries
+
+PRODUCT_VERSION_MAJOR = 9
+PRODUCT_VERSION_MINOR = 0
+PRODUCT_VERSION_MAINTENANCE = 0-RC0
+
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_DISPLAY_ID=ITL41D
+
+ifdef CM_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR)-$(shell date +%m%d%Y)-NIGHTLY-$(PRODUCT_RELEASE_NAME)
+else
+    ifdef CM_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)-KANG
+    endif
+endif
+
diff --git a/config/common_versions.mk b/config/common_versions.mk
deleted file mode 100644
index 24f360d2..00000000
--- a/config/common_versions.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-PRODUCT_BRAND := cm
-
-PRODUCT_VERSION_MAJOR = 9
-PRODUCT_VERSION_MINOR = 0
-PRODUCT_VERSION_MAINTENANCE = 0-RC0
-
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_DISPLAY_ID=ITL41D
-
-ifdef CM_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR)-$(shell date +%m%d%Y)-NIGHTLY-$(PRODUCT_RELEASE_NAME)
-else
-    ifdef CM_RELEASE
-        PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)
-    else
-        PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)-KANG
-    endif
-endif
-