am bbfebfad: resolved conflicts for merge of 303d2755 to klp-modular-dev-plus-aosp
* commit 'bbfebfad0d8ad002995bb1005b61a35b42a8ce35':
Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT.
diff --git a/CleanSpec.mk b/CleanSpec.mk
index f1bdc81..488014b 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -224,6 +224,11 @@
# 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
# ************************************************
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 99283b0..4929abb 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -41,7 +41,7 @@
# 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 @@
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)"