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

Commit d8515155 authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

Merge branch 'cm-11.0' into stable/cm-11.0 

Conflicts:
	tools/releasetools/ota_from_target_files

Change-Id: I8650692de60149d1cc2f8ebae6b3b4dc4693d13c
parents 734e9730 52520a72

CleanSpec.mk

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



# 4.4.4

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



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

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

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

core/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1369,6 +1369,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

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=KTU84P

core/config.mk

+5 −0
Original line number Diff line number Diff line
@@ -164,6 +164,11 @@ endif 
TARGET_DEVICE_DIR := $(patsubst %/,%,$(dir $(board_config_mk)))

board_config_mk :=



## Rebuild the pathmap if there's a recovery variant. Its path probably changed

ifneq ($(RECOVERY_VARIANT),)

include $(BUILD_SYSTEM)/pathmap.mk

endif



# Perhaps we should move this block to build/core/Makefile,

# once we don't have TARGET_NO_KERNEL reference in AndroidBoard.mk/Android.mk.

ifneq ($(strip $(TARGET_NO_BOOTLOADER)),true)

core/definitions.mk

+27 −7
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
@@ -1502,10 +1518,12 @@ $(hide) if [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq ] ; the 
    $(PRIVATE_JAVACFLAGS) \

    \@$(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq \

    2>$(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr \

    && rm -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr \

    || ( if [ -e $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr ]; then \

    && ( [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr ] && \

    echo -e ${CL_YLW}"`cat $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr`"${CL_RST} 1>&2; \

    rm -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr ) \

    || ( [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr ] && \

    echo -e ${CL_RED}"`cat $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr`"${CL_RST} 1>&2; \

    fi; rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR); exit 41 ) \

    rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR); exit 41 ) \

fi

$(if $(PRIVATE_JAVA_LAYERS_FILE), $(hide) build/tools/java-layers.py \

    $(PRIVATE_JAVA_LAYERS_FILE) \@$(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq,)
@@ -1558,10 +1576,12 @@ $(hide) if [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq ] ; the 
    $(PRIVATE_JAVACFLAGS) \

    \@$(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq \

    2>$(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr \

    && rm -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr \

    || ( if [ -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr ]; then \

    && ( [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr ] && \

    echo -e ${CL_YLW}"`cat $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr`"${CL_RST} 1>&2; \

    rm -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr ) \

    || ( [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr ] && \

    echo -e ${CL_RED}"`cat $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr`"${CL_RST} 1>&2; \

    fi; exit 41 ) \

    rm -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/srderr; exit 41 ) \

fi

$(hide) rm -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list

$(hide) rm -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq
@@ -1641,7 +1661,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)) \