cm: Commonize cmsdk specific targets.
Change-Id: I5e2f0b84ed34244b7549daf91053258193dd716f
diff --git a/config/cmsdk_common.mk b/config/cmsdk_common.mk
new file mode 100644
index 0000000..4aad982
--- /dev/null
+++ b/config/cmsdk_common.mk
@@ -0,0 +1,41 @@
+# Permissions for cmsdk services
+PRODUCT_COPY_FILES += \
+ vendor/cm/config/permissions/org.cyanogenmod.theme.xml:system/etc/permissions/org.cyanogenmod.theme.xml \
+ vendor/cm/config/permissions/org.cyanogenmod.livelockscreen.xml:system/etc/permissions/org.cyanogenmod.livelockscreen.xml
+
+# CM Platform Library
+PRODUCT_PACKAGES += \
+ org.cyanogenmod.platform-res \
+ org.cyanogenmod.platform \
+ org.cyanogenmod.platform.xml
+
+# CM Hardware Abstraction Framework
+PRODUCT_PACKAGES += \
+ org.cyanogenmod.hardware \
+ org.cyanogenmod.hardware.xml
+
+ifndef CM_PLATFORM_SDK_VERSION
+ # This is the canonical definition of the SDK version, which defines
+ # the set of APIs and functionality available in the platform. It
+ # is a single integer that increases monotonically as updates to
+ # the SDK are released. It should only be incremented when the APIs for
+ # the new release are frozen (so that developers don't write apps against
+ # intermediate builds).
+ CM_PLATFORM_SDK_VERSION := 5
+endif
+
+ifndef CM_PLATFORM_REV
+ # For internal SDK revisions that are hotfixed/patched
+ # Reset after each CM_PLATFORM_SDK_VERSION release
+ # If you are doing a release and this is NOT 0, you are almost certainly doing it wrong
+ CM_PLATFORM_REV := 0
+endif
+
+# CyanogenMod Platform SDK Version
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.cm.build.version.plat.sdk=$(CM_PLATFORM_SDK_VERSION)
+
+# CyanogenMod Platform Internal
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.cm.build.version.plat.rev=$(CM_PLATFORM_REV)
+
diff --git a/config/common.mk b/config/common.mk
index 736f1c4..a808822 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -121,13 +121,12 @@
PRODUCT_COPY_FILES += \
vendor/cm/config/permissions/com.cyanogenmod.android.xml:system/etc/permissions/com.cyanogenmod.android.xml
-# Live lockscreen
-PRODUCT_COPY_FILES += \
- vendor/cm/config/permissions/org.cyanogenmod.livelockscreen.xml:system/etc/permissions/org.cyanogenmod.livelockscreen.xml
-
# Theme engine
include vendor/cm/config/themes_common.mk
+# CMSDK
+include vendor/cm/config/cmsdk_common.mk
+
# Required CM packages
PRODUCT_PACKAGES += \
Development \
@@ -161,17 +160,6 @@
PRODUCT_PACKAGES += \
Exchange2
-# CM Platform Library
-PRODUCT_PACKAGES += \
- org.cyanogenmod.platform-res \
- org.cyanogenmod.platform \
- org.cyanogenmod.platform.xml
-
-# CM Hardware Abstraction Framework
-PRODUCT_PACKAGES += \
- org.cyanogenmod.hardware \
- org.cyanogenmod.hardware.xml
-
# Extra tools in CM
PRODUCT_PACKAGES += \
libsepol \
@@ -330,34 +318,9 @@
endif
endif
-ifndef CM_PLATFORM_SDK_VERSION
- # This is the canonical definition of the SDK version, which defines
- # the set of APIs and functionality available in the platform. It
- # is a single integer that increases monotonically as updates to
- # the SDK are released. It should only be incremented when the APIs for
- # the new release are frozen (so that developers don't write apps against
- # intermediate builds).
- CM_PLATFORM_SDK_VERSION := 5
-endif
-
-ifndef CM_PLATFORM_REV
- # For internal SDK revisions that are hotfixed/patched
- # Reset after each CM_PLATFORM_SDK_VERSION release
- # If you are doing a release and this is NOT 0, you are almost certainly doing it wrong
- CM_PLATFORM_REV := 0
-endif
-
PRODUCT_PROPERTY_OVERRIDES += \
ro.cm.display.version=$(CM_DISPLAY_VERSION)
-# CyanogenMod Platform SDK Version
-PRODUCT_PROPERTY_OVERRIDES += \
- ro.cm.build.version.plat.sdk=$(CM_PLATFORM_SDK_VERSION)
-
-# CyanogenMod Platform Internal
-PRODUCT_PROPERTY_OVERRIDES += \
- ro.cm.build.version.plat.rev=$(CM_PLATFORM_REV)
-
-include $(WORKSPACE)/build_env/image-auto-bits.mk
-include vendor/cyngn/product.mk
diff --git a/config/themes_common.mk b/config/themes_common.mk
index c3bcfa9..f16b52b 100644
--- a/config/themes_common.mk
+++ b/config/themes_common.mk
@@ -3,6 +3,3 @@
aapt \
ThemeChooser \
ThemesProvider
-
-PRODUCT_COPY_FILES += \
- vendor/cm/config/permissions/org.cyanogenmod.theme.xml:system/etc/permissions/org.cyanogenmod.theme.xml