Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90b35770 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change If922a88c into eclair 

* changes:
  Update version name to 2.1 and API to 7.
parents 81d88c31 c3e17966

cleanspec.mk

+4 −0
Original line number Diff line number Diff line
@@ -101,6 +101,10 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

core/version_defaults.mk

+2 −2
Original line number Diff line number Diff line
@@ -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 := 2.0.1

  PLATFORM_VERSION := 2.1

endif



ifeq "" "$(PLATFORM_SDK_VERSION)"
@@ -53,7 +53,7 @@ ifeq "" "$(PLATFORM_SDK_VERSION)" 
  # intermediate builds).  During development, this number remains at the

  # SDK version the branch is based on and PLATFORM_VERSION_CODENAME holds

  # the code-name of the new development work.

  PLATFORM_SDK_VERSION := 6

  PLATFORM_SDK_VERSION := 7

endif



ifeq "" "$(PLATFORM_VERSION_CODENAME)"