From 85fe6388fec3c57726e84724d565ce793990f4bc Mon Sep 17 00:00:00 2001 From: Abhishek G Date: Mon, 4 Apr 2016 17:03:24 -0700 Subject: Preventing default locale from being overridden because of buildinfo.sh Adding the ability to set default locale from the device tree. Adding the TARGET_SKIP_DEFAULT_LOCALE flag which can be set in the device tree, thus preventing buildinfo.sh from overriding default locale. Change-Id: I66bcedb42216acee56ceaf657a39dc23d7eea6f4 Issue-Id: FEIJ-22 --- core/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'core/Makefile') diff --git a/core/Makefile b/core/Makefile index 583e79d..5177476 100644 --- a/core/Makefile +++ b/core/Makefile @@ -248,6 +248,7 @@ endif TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \ TARGET_AAPT_CHARACTERISTICS="$(TARGET_AAPT_CHARACTERISTICS)" \ TARGET_UNIFIED_DEVICE="$(TARGET_UNIFIED_DEVICE)" \ + TARGET_SKIP_DEFAULT_LOCALE="$(TARGET_SKIP_DEFAULT_LOCALE)" \ $(PRODUCT_BUILD_PROP_OVERRIDES) \ bash $(BUILDINFO_SH) >> $@ $(hide) $(foreach file,$(system_prop_file), \ -- cgit v1.1 From 4bbce4fdc6186d3dd6986daff4fc5ce6dc918421 Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Wed, 13 Apr 2016 17:49:36 -0700 Subject: build: Add BOOTIMAGE_EXTRA_DEPS for BOOT_SIGNER products too * Products supporting BOOT_SIGNER should depend on BOOTIMAGE_EXTRA_DEPS as well, since that dt.img generation is tied to that rule. Change-Id: I7c3040d0c59c66aaac46121d6ca50ab96bdf7e72 --- core/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/Makefile') diff --git a/core/Makefile b/core/Makefile index 5177476..4d91425 100644 --- a/core/Makefile +++ b/core/Makefile @@ -544,7 +544,7 @@ ifeq ($(TARGET_BOOTIMAGE_USE_EXT2),true) $(error TARGET_BOOTIMAGE_USE_EXT2 is not supported anymore) else ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_BOOT_SIGNER)) # TARGET_BOOTIMAGE_USE_EXT2 != true -$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(BOOT_SIGNER) +$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(BOOT_SIGNER) $(BOOTIMAGE_EXTRA_DEPS) $(call pretty,"Target boot image: $@") $(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@ $(BOOT_SIGNER) /boot $@ $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8 $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x509.pem $@ -- cgit v1.1 From c9c78dbd214d3ca9e79788c3406a40cb80638dcb Mon Sep 17 00:00:00 2001 From: Diogo Ferreira Date: Fri, 4 Sep 2015 11:59:13 +0100 Subject: build: Create a oem image when BOARD_OEMIMAGE_FILE_SYSTEM_TYPE is defined This adds the capability of generating a OEM image with the build and adding it to target files when BOARD_OEMIMAGE_FILE_SYSTEM_TYPE is set. Change-Id: I6c596d58d9d5ece1a261d953eeb8c60eac30e642 Ticket: CYNGNOS-936 (cherry picked from commit 1966a9e7c22b95eb4c16be6aee7adf43cb6ce118) --- core/Makefile | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'core/Makefile') diff --git a/core/Makefile b/core/Makefile index 4d91425..1146f13 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1650,6 +1650,7 @@ endif # Depending on the various images guarantees that the underlying # directories are up-to-date. +include $(BUILD_SYSTEM)/tasks/oem_image.mk $(BUILT_TARGET_FILES_PACKAGE): \ $(INSTALLED_BOOTIMAGE_TARGET) \ $(INSTALLED_RADIOIMAGE_TARGET) \ @@ -1658,6 +1659,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \ $(INSTALLED_USERDATAIMAGE_TARGET) \ $(INSTALLED_CACHEIMAGE_TARGET) \ $(INSTALLED_VENDORIMAGE_TARGET) \ + $(INSTALLED_OEMIMAGE_TARGET) \ $(INSTALLED_ANDROID_INFO_TXT_TARGET) \ $(SELINUX_FC) \ $(built_ota_tools) \ @@ -1767,6 +1769,11 @@ ifdef BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE $(hide) $(call package_files-copy-root, \ $(TARGET_OUT_VENDOR),$(zip_root)/VENDOR) endif +ifdef BOARD_OEMIMAGE_FILE_SYSTEM_TYPE + @# Contents of the oem image + $(call package_files-copy-root, \ + $(TARGET_OUT_OEM),$(zip_root)/OEM) +endif @# Extra contents of the OTA package $(hide) mkdir -p $(zip_root)/OTA/bin $(hide) $(ACP) $(INSTALLED_ANDROID_INFO_TXT_TARGET) $(zip_root)/OTA/ -- cgit v1.1 From 06a72275fb859eaffd879c22f86b87a0e3f36e87 Mon Sep 17 00:00:00 2001 From: Edward Wang Date: Fri, 15 Apr 2016 23:03:14 -0700 Subject: build: skip 'ro.product.device' using new macro "TARGET_SKIP_PRODUCT_DEVICE" Change-Id: Id17ef7de8b0146dd6e4b2cc3cc5b88453da38f6c Ticket: FEIJ-62 --- core/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'core/Makefile') diff --git a/core/Makefile b/core/Makefile index 1146f13..3ac9b0d 100644 --- a/core/Makefile +++ b/core/Makefile @@ -249,6 +249,7 @@ endif TARGET_AAPT_CHARACTERISTICS="$(TARGET_AAPT_CHARACTERISTICS)" \ TARGET_UNIFIED_DEVICE="$(TARGET_UNIFIED_DEVICE)" \ TARGET_SKIP_DEFAULT_LOCALE="$(TARGET_SKIP_DEFAULT_LOCALE)" \ + TARGET_SKIP_PRODUCT_DEVICE="$(TARGET_SKIP_PRODUCT_DEVICE)" \ $(PRODUCT_BUILD_PROP_OVERRIDES) \ bash $(BUILDINFO_SH) >> $@ $(hide) $(foreach file,$(system_prop_file), \ -- cgit v1.1