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

Commit fb28a3a4 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

resolved conflicts for merge of 0f4e3718 to master 

Change-Id: Ib3615c79fdd9839208c2b14bd58d1d08e4ac49b8
parents 04fc926d 0f4e3718

CleanSpec.mk

+2 −0
Original line number 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)/obj/APPS/*)



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



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

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

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

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

  PLATFORM_VERSION := 4.2.2

endif



ifeq "" "$(PLATFORM_SDK_VERSION)"