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

Commit 740c7f07 authored by Matt Garnes's avatar Matt Garnes
Browse files

Merge CAF branch 'LA.BR.1.2.1_rb2.12' into caf/cm-12.0.

parents 67fec8b7 6a2f946d

CleanSpec.mk

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



# 5.0.1

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



# 5.0.2

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



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

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

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

core/build_id.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
# (like "CRB01").  It must be a single word, and is

# capitalized by convention.



export BUILD_ID=LRX21M
 
export BUILD_ID=LRX22G

core/version_defaults.mk

+1 −1
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 := 5.0

  PLATFORM_VERSION := 5.0.2

endif



ifeq "" "$(PLATFORM_SDK_VERSION)"