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

Commit af5cb904 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 176c758c: Change version to MR2 development. 

Merge commit '176c758c' into eclair-mr2-plus-aosp

* commit '176c758c':
  Change version to MR2 development.
parents af830d39 176c758c

cleanspec.mk

+4 −0
Original line number Diff line number Diff line
@@ -119,6 +119,10 @@ $(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)/system/app/GoogleSubscribedFeedsProvider.apk)

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

$(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)



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

# 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.1

  PLATFORM_VERSION := Eclair-MR2

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 := Eclair-MR2

endif



ifeq "" "$(DEFAULT_APP_TARGET_SDK)"