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

Commit 0413efd2 authored by Griff Hazen's avatar Griff Hazen
Browse files

resolved conflicts for merge of 3bb81eb0 to klp-modular-dev-plus-aosp

parents 2f4c0a86 3bb81eb0

CleanSpec.mk

+5 −0
Original line number Original line Diff line number Diff line
@@ -229,6 +229,11 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) 
# Adding dalvik.vm.dex2oat-flags to eng builds

# Adding dalvik.vm.dex2oat-flags to eng builds

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

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





# 4.4.4 (KKWT)

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

+3 −3
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 := KKWT

  PLATFORM_VERSION := 4.4W

endif

endif





ifeq "" "$(PLATFORM_SDK_VERSION)"

ifeq "" "$(PLATFORM_SDK_VERSION)"
@@ -53,13 +53,13 @@ ifeq "" "$(PLATFORM_SDK_VERSION)" 
  # intermediate builds).  During development, this number remains at the

  # intermediate builds).  During development, this number remains at the

  # SDK version the branch is based on and PLATFORM_VERSION_CODENAME holds

  # SDK version the branch is based on and PLATFORM_VERSION_CODENAME holds

  # the code-name of the new development work.

  # the code-name of the new development work.

  PLATFORM_SDK_VERSION := 19

  PLATFORM_SDK_VERSION := 20

endif

endif





ifeq "" "$(PLATFORM_VERSION_CODENAME)"

ifeq "" "$(PLATFORM_VERSION_CODENAME)"

  # This is the current development code-name, if the build is not a final

  # This is the current development code-name, if the build is not a final

  # release build.  If this is a final release build, it is simply "REL".

  # release build.  If this is a final release build, it is simply "REL".

  PLATFORM_VERSION_CODENAME := KKWT

  PLATFORM_VERSION_CODENAME := REL

endif

endif





ifeq "" "$(DEFAULT_APP_TARGET_SDK)"

ifeq "" "$(DEFAULT_APP_TARGET_SDK)"