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

Commit cf33c013 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Merge tag 'android-4.4.3_r1' into HEAD 

Android 4.4.3 release 1

Change-Id: Ie4ad0f5e2785df0f5083e1bc93951ce389b293e5
parents 651987c5 92d48362

CleanSpec.mk

+3 −0
Original line number Diff line number Diff line
@@ -211,6 +211,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) 
# 4.4.2

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



# 4.4.3

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



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

core/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -1367,6 +1367,7 @@ endif 
	@# build them.

	$(hide) mkdir -p $(zip_root)/META

	$(hide) $(ACP) $(APKCERTS_FILE) $(zip_root)/META/apkcerts.txt

	$(hide) if test -e $(tool_extensions)/releasetools.py; then $(ACP) $(tool_extensions)/releasetools.py $(zip_root)/META/; fi

	$(hide)	echo "$(PRODUCT_OTA_PUBLIC_KEYS)" > $(zip_root)/META/otakeys.txt

	$(hide) echo "recovery_api_version=$(PRIVATE_RECOVERY_API_VERSION)" > $(zip_root)/META/misc_info.txt

	$(hide) echo "fstab_version=$(PRIVATE_RECOVERY_FSTAB_VERSION)" >> $(zip_root)/META/misc_info.txt
@@ -1386,6 +1387,7 @@ ifdef PRODUCT_EXTRA_RECOVERY_KEYS 
endif

	$(hide) echo "mkbootimg_args=$(BOARD_MKBOOTIMG_ARGS)" >> $(zip_root)/META/misc_info.txt

	$(hide) echo "use_set_metadata=1" >> $(zip_root)/META/misc_info.txt

	$(hide) echo "multistage_support=1" >> $(zip_root)/META/misc_info.txt

	$(hide) echo "update_rename_support=1" >> $(zip_root)/META/misc_info.txt

	$(call generate-userimage-prop-dictionary, $(zip_root)/META/misc_info.txt)

ifdef PRODUCT_DEFAULT_DEV_CERTIFICATE

core/build_id.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
# (like "CRB01").  It must be a single word, and is

# capitalized by convention.



export BUILD_ID=KVT49L
 
export BUILD_ID=KTU84L

core/definitions.mk

+17 −1
Original line number Diff line number Diff line
@@ -341,6 +341,22 @@ define find-other-html-files 
	$(call find-subdir-files,$(1) -name "*.html" -and -not -name ".*")

endef



###########################################################

# Use utility find to find given files in the given subdirs.

# This function uses $(1), instead of LOCAL_PATH as the base.

# $(1): the base dir, relative to the root of the source tree.

# $(2): the file name pattern to be passed to find as "-name".

# $(3): a list of subdirs of the base dir.

# Returns: a list of paths relative to the base dir.

###########################################################



define find-files-in-subdirs

$(patsubst ./%,%, \

  $(shell cd $(1) ; \

          find -L $(3) -name $(2) -and -not -name ".*") \

 )

endef



###########################################################

## Scan through each directory of $(1) looking for files

## that match $(2) using $(wildcard).  Useful for seeing if
@@ -1641,7 +1657,7 @@ $(hide) $(AAPT) package -u $(PRIVATE_AAPT_FLAGS) \ 
    $(addprefix -I , $(PRIVATE_AAPT_INCLUDES)) \

    $(addprefix --min-sdk-version , $(PRIVATE_DEFAULT_APP_TARGET_SDK)) \

    $(addprefix --target-sdk-version , $(PRIVATE_DEFAULT_APP_TARGET_SDK)) \

    $(addprefix --product , $(TARGET_AAPT_CHARACTERISTICS)) \

    $(if $(filter --product,$(PRIVATE_AAPT_FLAGS)),,$(addprefix --product , $(TARGET_AAPT_CHARACTERISTICS))) \

    $(if $(filter --version-code,$(PRIVATE_AAPT_FLAGS)),,$(addprefix --version-code , $(PLATFORM_SDK_VERSION))) \

    $(if $(filter --version-name,$(PRIVATE_AAPT_FLAGS)),,$(addprefix --version-name , $(PLATFORM_VERSION)-$(BUILD_NUMBER))) \

    $(addprefix --rename-manifest-package , $(PRIVATE_MANIFEST_PACKAGE_NAME)) \

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ ifeq "" "$(PLATFORM_VERSION)" 
  # which is the version that we reveal to the end user.

  # Update this value when the platform version changes (rather

  # than overriding it somewhere else).  Can be an arbitrary string.

  PLATFORM_VERSION := 4.4.2

  PLATFORM_VERSION := 4.4.3

endif



ifeq "" "$(PLATFORM_SDK_VERSION)"