Merge "Mmmmmm... Gingerbread!"

This commit is contained in:
Dianne Hackborn
2010-04-22 16:24:19 -07:00
committed by Android (Google) Code Review
2 changed files with 5 additions and 2 deletions

View File

@@ -184,6 +184,9 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/*)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/*)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS)
# ************************************************ # ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

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 := Kraken PLATFORM_VERSION := Gingerbread
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 := Kraken PLATFORM_VERSION_CODENAME := Gingerbread
endif endif
ifeq "" "$(DEFAULT_APP_TARGET_SDK)" ifeq "" "$(DEFAULT_APP_TARGET_SDK)"