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

Commit 8edd7f9a authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

resolved conflicts for merge of 3f72af13 to master 

Change-Id: I675df80f6e4435e6fb275c8c1527fdc966c0322c
parents aef9309b 3f72af13

CleanSpec.mk

+3 −0
Original line number Diff line number Diff line
@@ -87,6 +87,9 @@ $(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)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/YouTube*)

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



$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libstagefright_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libstagefright_omx_intermediates)

core/version_defaults.mk

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

  PLATFORM_SDK_VERSION := 13

endif



ifeq "" "$(PLATFORM_VERSION_CODENAME)"