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

Commit e4584a41 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Shhhhhhh!!!" into lmp-dev

parents ab7ca1d2 bf9b9275

CleanSpec.mk

+5 −0
Original line number Diff line number Diff line
@@ -289,6 +289,11 @@ $(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)/recovery/root/default.prop)



# API 21?

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

+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 := 20

  PLATFORM_SDK_VERSION := 21

endif



ifeq "" "$(PLATFORM_VERSION_CODENAME)"