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

Commit 3bad5540 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Here lies JB MR2: In with a whimper, out with a bang. 

Change-Id: Id75e084b8447234cf5d2c26ccd0e13111dde6684
parent b6c2e6b6

CleanSpec.mk

+13 −0
Original line number Diff line number Diff line
@@ -168,6 +168,19 @@ $(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/*)



# So...  funny story.  Recall when I mentioned above the

# "JB MR2" thing?  I didn't mean that.  In fact, while I was

# writing JB MR, my head was thinking 4.2, and things got

# cross-wired as they are wont to do, and we ended up with

# JB MR2, which didn't actually exist.

#

# Well, didn't exist then.

#

# Now it does.  Say hi, JB MR2!

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



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

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

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

core/version_defaults.mk

+3 −3
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 := JellyBeanMR2

  PLATFORM_VERSION := 4.3

endif



ifeq "" "$(PLATFORM_SDK_VERSION)"
@@ -53,13 +53,13 @@ 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 := 17

  PLATFORM_SDK_VERSION := 18

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 := JellyBeanMR2

  PLATFORM_VERSION_CODENAME := REL

endif



ifeq "" "$(DEFAULT_APP_TARGET_SDK)"