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

Commit c3868ae3 authored by Bart Sears's avatar Bart Sears
Browse files

resolved conflicts for merge of 6d607ee7 to lmp-mr1-dev-plus-aosp 

Change-Id: I0a49bf5492cd5c1b03cf8cddd219db326d586909
parents 1c10f075 6d607ee7

CleanSpec.mk

+6 −0
Original line number Original line Diff line number Diff line
@@ -349,6 +349,12 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop)





# 5.1.1!

$(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

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

  PLATFORM_VERSION := 5.1.1

endif

endif





ifeq "" "$(PLATFORM_SDK_VERSION)"

ifeq "" "$(PLATFORM_SDK_VERSION)"