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

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

Merge "Obviously JB MR1.1 should be Android 4.2.2." into jb-mr1.1-dev

parents 4bfc9991 aa48e74b

CleanSpec.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -150,6 +150,8 @@ $(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/*)





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



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

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

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

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

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

core/version_defaults.mk

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

  PLATFORM_VERSION := 4.2.2

endif

endif





ifeq "" "$(PLATFORM_SDK_VERSION)"

ifeq "" "$(PLATFORM_SDK_VERSION)"