Merge branch 'cm-11.0' into stable/cm-11.0 (0226dbfb) · Commits · e / os / android_build

core/Makefile

+13 −7

Original line number	Diff line number	Diff line
		@@ -672,7 +672,7 @@ else
		ifeq ($(BOARD_USES_RECOVERY_CHARGEMODE),true)
		$(error BOARD_USES_RECOVERY_CHARGEMODE is deprecated. Please see http://bit.ly/opcSJZ on how to properly implement chargemode in recovery. Or just remove the BOARD_USES_RECOVERY_CHARGEMODE if you are lazy. I will hate you though. -Koush)
		else
		recovery_initrc := $(call include-path-for, recovery)/etc/init.rc
		recovery_initrc := $(call project-path-for,recovery)/etc/init.rc
		endif
		endif
		ifneq ($(TARGET_PREBUILT_RECOVERY_KERNEL),)
		@@ -680,14 +680,22 @@ ifneq ($(TARGET_PREBUILT_RECOVERY_KERNEL),)
		else
		recovery_kernel := $(INSTALLED_KERNEL_TARGET) # same as a non-recovery system
		endif
		ifeq ($(TARGET_RECOVERY_SCREEN_WIDTH),)
		ifeq ($(TARGET_SCREEN_WIDTH),)
		TARGET_RECOVERY_SCREEN_WIDTH := 720
		else
		TARGET_RECOVERY_SCREEN_WIDTH := $(TARGET_SCREEN_WIDTH)
		endif
		endif
		recovery_uncompressed_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.cpio
		recovery_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.img
		recovery_build_prop := $(INSTALLED_BUILD_PROP_TARGET)
		recovery_binary := $(call intermediates-dir-for,EXECUTABLES,recovery)/recovery
		recovery_resources_common := $(call include-path-for, recovery)/res
		recovery_resources_common := $(call project-path-for,recovery)/res
		recovery_resources_extra := $(call project-path-for,recovery)/res-$(TARGET_RECOVERY_SCREEN_WIDTH)
		recovery_resources_private := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery/res))
		recovery_root_private := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery/root))
		recovery_resource_deps := $(shell find $(recovery_resources_common) \
		recovery_resource_deps := $(shell find $(recovery_resources_common) $(recovery_resources_extra) \
		$(recovery_resources_private) $(recovery_root_private) -type f)
		ifneq ($(TARGET_RECOVERY_FSTAB),)
		recovery_fstab := $(strip $(wildcard $(TARGET_RECOVERY_FSTAB)))
		@@ -724,9 +732,6 @@ endif
		ifneq ($(BOARD_FORCE_RAMDISK_ADDRESS),)
		INTERNAL_RECOVERYIMAGE_ARGS += --ramdiskaddr $(BOARD_FORCE_RAMDISK_ADDRESS)
		endif
		INTERNAL_RECOVERY_FILES := $(filter $(TARGET_RECOVERY_OUT)/%, \
		$(foreach module, $(ALL_MODULES), $(ALL_MODULES.$(module).INSTALLED)) \
		$(ALL_DEFAULT_INSTALLED_MODULES))

		# Keys authorized to sign OTA packages this build will accept. The
		# build always uses dev-keys for this; release packaging tools will
		@@ -757,7 +762,7 @@ $(RECOVERY_INSTALL_OTA_KEYS): $(OTA_PUBLIC_KEYS) $(DUMPKEY_JAR) $(extra_keys)

		TARGET_RECOVERY_ROOT_TIMESTAMP := $(TARGET_RECOVERY_OUT)/root.ts

		$(TARGET_RECOVERY_ROOT_TIMESTAMP): $(INTERNAL_RECOVERY_FILES) \
		$(TARGET_RECOVERY_ROOT_TIMESTAMP): \
		$(INSTALLED_RAMDISK_TARGET) \
		$(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) \
		$(recovery_binary) \
		@@ -779,6 +784,7 @@ $(TARGET_RECOVERY_ROOT_TIMESTAMP): $(INTERNAL_RECOVERY_FILES) \
		$(hide) cp -f $(recovery_binary) $(TARGET_RECOVERY_ROOT_OUT)/sbin/
		mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system/bin
		$(hide) cp -rf $(recovery_resources_common) $(TARGET_RECOVERY_ROOT_OUT)/
		if test -d $(recovery_resources_extra); then cp -rf $(recovery_resources_extra)/* $(TARGET_RECOVERY_ROOT_OUT)/res; fi
		$(hide) $(foreach item,$(recovery_resources_private), \
		cp -rf $(item) $(TARGET_RECOVERY_ROOT_OUT)/)
		$(foreach item,$(recovery_root_private), \

core/config.mk

+3 −4

Original line number	Diff line number	Diff line
		@@ -163,10 +163,9 @@ 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
		# General entries for project pathmap. Any entries listed here should
		# be device and hardware independent.
		$(call project-set-path-variant,recovery,RECOVERY_VARIANT,bootable/recovery)

		# Perhaps we should move this block to build/core/Makefile,
		# once we don't have TARGET_NO_KERNEL reference in AndroidBoard.mk/Android.mk.

core/definitions.mk

+3 −3

Original line number	Diff line number	Diff line
		@@ -1848,19 +1848,19 @@ endef

		# Copy a prebuilt file to a target location.
		define transform-prebuilt-to-target
		@echo -e "$(if $(PRIVATE_IS_HOST_MODULE),host,target) "${CL_CYN}"Prebuilt:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
		@echo -e ${CL_CYN}"$(if $(PRIVATE_IS_HOST_MODULE),host,target) Prebuilt:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
		$(copy-file-to-target)
		endef

		# Copy a prebuilt file to a target location, using zipalign on it.
		define transform-prebuilt-to-target-with-zipalign
		@echo "$(if $(PRIVATE_IS_HOST_MODULE),host,target) "${CL_CYN}"Prebuilt APK:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
		@echo -e ${CL_CYN}"$(if $(PRIVATE_IS_HOST_MODULE),host,target) Prebuilt APK:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
		$(copy-file-to-target-with-zipalign)
		endef

		# Copy a prebuilt file to a target location, stripping "# comment" comments.
		define transform-prebuilt-to-target-strip-comments
		@echo "$(if $(PRIVATE_IS_HOST_MODULE),host,target) "${CL_CYN}"Prebuilt:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
		@echo -e ${CL_CYN}"$(if $(PRIVATE_IS_HOST_MODULE),host,target) Prebuilt:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
		$(copy-file-to-target-strip-comments)
		endef

core/generate_extra_images.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -90,7 +90,7 @@ include device/qcom/common/dtbtool/Android.mk
		endif

		ifeq ($(strip $(TARGET_CUSTOM_DTBTOOL)),)
		DTBTOOL_NAME := dtbTool
		DTBTOOL_NAME := dtbToolCM
		else
		DTBTOOL_NAME := $(TARGET_CUSTOM_DTBTOOL)
		endif

core/pathmap.mk

+30 −6

Original line number	Diff line number	Diff line
		@@ -53,12 +53,6 @@ pathmap_INCL := \
		wilhelm-ut:frameworks/wilhelm/src/ut \
		speex:external/speex/include

		ifneq ($(RECOVERY_VARIANT),)
		pathmap_INCL += recovery:bootable/recovery-$(RECOVERY_VARIANT)
		else
		pathmap_INCL += recovery:bootable/recovery
		endif

		#
		# Returns the path to the requested module's include directory,
		# relative to the root of the source tree. Does not handle external
		@@ -70,6 +64,36 @@ define include-path-for
		$(foreach n,$(1),$(patsubst $(n):%,%,$(filter $(n):%,$(pathmap_INCL))))
		endef

		# Enter project path into pathmap
		#
		# $(1): name
		# $(2): path
		#
		define project-set-path
		$(eval pathmap_PROJ += $(1):$(2))
		endef

		# Enter variant project path into pathmap
		#
		# $(1): name
		# $(2): variable to check
		# $(3): base path
		#
		define project-set-path-variant
		$(call project-set-path,$(1),$(strip \
		$(if $($(2)), \
		$(3)-$($(2)), \
		$(3))))
		endef

		# Returns the path to the requested module's include directory,
		# relative to the root of the source tree.
		#
		# $(1): a list of modules (or other named entities) to find the projects for
		define project-path-for
		$(foreach n,$(1),$(patsubst $(n):%,%,$(filter $(n):%,$(pathmap_PROJ))))
		endef

		#
		# Many modules expect to be able to say "#include <jni.h>",
		# so make it easy for them to find the correct path.