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

Commit 1b601a44 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "MR1 is version 4.1, API 15." into ics-mr1

parents 3bd8e467 b32faad3

CleanSpec.mk

+4 −0
Original line number Diff line number Diff line
@@ -103,6 +103,10 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/JAVA_LIBRARIES/*)

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

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

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

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



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

# 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 := 4.0.1

  PLATFORM_VERSION := 4.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 := 14

  PLATFORM_SDK_VERSION := 15

endif



ifeq "" "$(PLATFORM_VERSION_CODENAME)"