diff options
| author | Justin Koh <justinkoh@google.com> | 2014-02-04 23:42:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-04 23:42:07 +0000 |
| commit | 19753f458bc5ec546f4c5bb304072a53b4f9357f (patch) | |
| tree | b0773614ff034555a2dc532f8a5201a7afdda3f4 | |
| parent | 01ce19c95f358ac8ef9bb939d2637ac976320401 (diff) | |
| parent | bbfebfad0d8ad002995bb1005b61a35b42a8ce35 (diff) | |
| download | build-19753f458bc5ec546f4c5bb304072a53b4f9357f.zip build-19753f458bc5ec546f4c5bb304072a53b4f9357f.tar.gz build-19753f458bc5ec546f4c5bb304072a53b4f9357f.tar.bz2 | |
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.
| -rw-r--r-- | CleanSpec.mk | 5 | ||||
| -rw-r--r-- | core/version_defaults.mk | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index f1bdc81..488014b 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -224,6 +224,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 # ************************************************ 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 @@ 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)" |