cm: Commonize cmsdk specific targets.

Change-Id: I5e2f0b84ed34244b7549daf91053258193dd716f
This commit is contained in:
Adnan Begovic 2016-03-15 14:17:47 -07:00
parent 649c8328e5
commit f3610f55e7
3 changed files with 44 additions and 43 deletions

41
config/cmsdk_common.mk Normal file
View File

@ -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)

View File

@ -121,13 +121,12 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
vendor/cm/config/permissions/com.cyanogenmod.android.xml:system/etc/permissions/com.cyanogenmod.android.xml 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 # Theme engine
include vendor/cm/config/themes_common.mk include vendor/cm/config/themes_common.mk
# CMSDK
include vendor/cm/config/cmsdk_common.mk
# Required CM packages # Required CM packages
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
Development \ Development \
@ -161,17 +160,6 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
Exchange2 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 # Extra tools in CM
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
libsepol \ libsepol \
@ -330,34 +318,9 @@ ifneq ($(PRODUCT_DEFAULT_DEV_CERTIFICATE),build/target/product/security/testkey)
endif endif
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 += \ PRODUCT_PROPERTY_OVERRIDES += \
ro.cm.display.version=$(CM_DISPLAY_VERSION) 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 $(WORKSPACE)/build_env/image-auto-bits.mk
-include vendor/cyngn/product.mk -include vendor/cyngn/product.mk

View File

@ -3,6 +3,3 @@ PRODUCT_PACKAGES += \
aapt \ aapt \
ThemeChooser \ ThemeChooser \
ThemesProvider ThemesProvider
PRODUCT_COPY_FILES += \
vendor/cm/config/permissions/org.cyanogenmod.theme.xml:system/etc/permissions/org.cyanogenmod.theme.xml