forked from openkylin/platform_build
resolved conflicts for merge of 303d2755
to klp-modular-dev-plus-aosp
Change-Id: I653cac50cf71b75d47974dde833468fa61024ae9
This commit is contained in:
commit
bbfebfad0d
|
@ -218,6 +218,11 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
|
|||
# Rename persist.sys.dalvik.vm.lib to allow new default
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
|
||||
|
||||
# KKWT development
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
|
||||
|
||||
# ************************************************
|
||||
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
|
||||
# ************************************************
|
||||
|
|
|
@ -41,7 +41,7 @@ ifeq "" "$(PLATFORM_VERSION)"
|
|||
# which is the version that we reveal to the end user.
|
||||
# Update this value when the platform version changes (rather
|
||||
# than overriding it somewhere else). Can be an arbitrary string.
|
||||
PLATFORM_VERSION := 4.4.2
|
||||
PLATFORM_VERSION := KKWT
|
||||
endif
|
||||
|
||||
ifeq "" "$(PLATFORM_SDK_VERSION)"
|
||||
|
@ -59,7 +59,7 @@ endif
|
|||
ifeq "" "$(PLATFORM_VERSION_CODENAME)"
|
||||
# This is the current development code-name, if the build is not a final
|
||||
# release build. If this is a final release build, it is simply "REL".
|
||||
PLATFORM_VERSION_CODENAME := REL
|
||||
PLATFORM_VERSION_CODENAME := KKWT
|
||||
endif
|
||||
|
||||
ifeq "" "$(DEFAULT_APP_TARGET_SDK)"
|
||||
|
|
Loading…
Reference in New Issue