StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4b4244cb: am 56866c4d: Merge "Remove M codename, version number is 6.0." into mnc-dev

Browse Source 
* commit '4b4244cb03bb6f5339859c4631717fe0ddeec4e8':
  Remove M codename, version number is 6.0.
This commit is contained in:
Dianne Hackborn
2015-08-01 16:34:31 +00:00
committed by Android Git Automerger
parent b362f89e15 4b4244cb03
commit f4dbf25a6e
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CleanSpec.mk
View File

@@ -364,6 +364,11 @@ $(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)/system/app/*)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
# 23 is becoming more alive!!!
$(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 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************ # ************************************************

4
core/version_defaults.mk
View File

@@ -41,7 +41,7 @@ ifeq "" "$(PLATFORM_VERSION)"
# which is the version that we reveal to the end user. # which is the version that we reveal to the end user.
# Update this value when the platform version changes (rather # Update this value when the platform version changes (rather
# than overriding it somewhere else). Can be an arbitrary string. # than overriding it somewhere else). Can be an arbitrary string.
PLATFORM_VERSION := M PLATFORM_VERSION := 6.0
endif endif
ifeq "" "$(PLATFORM_SDK_VERSION)" ifeq "" "$(PLATFORM_SDK_VERSION)"
@@ -59,7 +59,7 @@ endif
ifeq "" "$(PLATFORM_VERSION_CODENAME)" ifeq "" "$(PLATFORM_VERSION_CODENAME)"
# This is the current development code-name, if the build is not a final # 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". # release build. If this is a final release build, it is simply "REL".
PLATFORM_VERSION_CODENAME := MNC PLATFORM_VERSION_CODENAME := REL
# This is all of the development codenames that are active. Should be either # This is all of the development codenames that are active. Should be either
# the same as PLATFORM_VERSION_CODENAME or a comma-separated list of additional # the same as PLATFORM_VERSION_CODENAME or a comma-separated list of additional