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

Commit dd0afa03 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

resolved conflicts for merge of 0c651756 to master 

Change-Id: Ifd66a3daa792f88ac2db0c24a11962d445e8f22d
parents 04d0f5f3 0c651756

CleanSpec.mk

+5 −0
Original line number Diff line number Diff line
@@ -265,6 +265,11 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) 
# Switching to 32-bit-by-default host multilib build

$(call add-clean-step, rm -rf $(HOST_OUT_INTERMEDIATES))



# KKWT has become API 20

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

+2 −2
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 := 19

  PLATFORM_SDK_VERSION := 20

endif



ifeq "" "$(PLATFORM_VERSION_CODENAME)"
@@ -64,7 +64,7 @@ ifeq "" "$(PLATFORM_VERSION_CODENAME)" 
  # This is all of the development codenames that are active.  Should be either

  # the same as PLATFORM_VERSION_CODENAME or a comma-separated list of additional

  # codenames after PLATFORM_VERSION_CODENAME.

  PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME),KKWT

  PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME)

endif



ifeq "" "$(DEFAULT_APP_TARGET_SDK)"