Merge commit 'b89ec38113a22d09b0832ed2d3cb8fc413a14a75' into HEAD (251412b4) · Commits · e / os / android_build

CleanSpec.mk

+10 −0

Original line number	Diff line number	Diff line
		@@ -302,6 +302,11 @@ $(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/*)

		# API 22!
		$(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/*)

		# Move to libc++ as the default STL.
		$(call add-clean-step, rm -rf $(OUT_DIR))

		@@ -315,6 +320,11 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop)
		# an ABI change since the names will mangle differently.
		$(call add-clean-step, rm -rf $(OUT_DIR))

		# 5.1!
		$(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/*)

		# Remove ro.product.locale.language/country and add ro.product.locale
		# instead.
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)

core/Makefile

+34 −10

Original line number	Diff line number	Diff line
		@@ -183,6 +183,7 @@ ifneq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_OEM_PROPERTIES),)
		echo "import /oem/oem.prop $(prop)" >> $@;)
		endif
		$(hide) TARGET_BUILD_TYPE="$(TARGET_BUILD_VARIANT)" \
		TARGET_BUILD_FLAVOR="$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)" \
		TARGET_DEVICE="$(TARGET_DEVICE)" \
		PRODUCT_NAME="$(TARGET_PRODUCT)" \
		PRODUCT_BRAND="$(PRODUCT_BRAND)" \
		@@ -492,14 +493,14 @@ else ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY)) # TARGE
		$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(BOOT_SIGNER)
		$(call pretty,"Target boot image: $@")
		$(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@
		$(BOOT_SIGNER) /boot $@ $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY) $@
		$(BOOT_SIGNER) /boot $@ $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8 $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x509.pem $@
		$(hide) $(call assert-max-image-size,$@,$(BOARD_BOOTIMAGE_PARTITION_SIZE))

		.PHONY: bootimage-nodeps
		bootimage-nodeps: $(MKBOOTIMG) $(BOOT_SIGNER)
		@echo "make $@: ignoring dependencies"
		$(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $(INSTALLED_BOOTIMAGE_TARGET)
		$(BOOT_SIGNER) /boot $(INSTALLED_BOOTIMAGE_TARGET) $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY) $(INSTALLED_BOOTIMAGE_TARGET)
		$(BOOT_SIGNER) /boot $(INSTALLED_BOOTIMAGE_TARGET) $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8 $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x509.pem $(INSTALLED_BOOTIMAGE_TARGET)
		$(hide) $(call assert-max-image-size,$(INSTALLED_BOOTIMAGE_TARGET),$(BOARD_BOOTIMAGE_PARTITION_SIZE))

		else # PRODUCT_SUPPORTS_VERITY != true
		@@ -661,6 +662,13 @@ endif
		endif
		endif

		# These options tell the recovery updater/installer how to mount the partitions writebale.
		# <fstype>=<fstype_opts>[\|<fstype_opts>]...
		# fstype_opts := <opt>[,<opt>]...
		# opt := <name>[=<value>]
		# The following worked on Nexus devices with Kernel 3.1, 3.4, 3.10
		DEFAULT_TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS := ext4=max_batch_time=0,commit=1,data=ordered,barrier=1,errors=panic,nodelalloc

		ifneq (true,$(TARGET_USERIMAGES_SPARSE_EXT_DISABLED))
		INTERNAL_USERIMAGES_SPARSE_EXT_FLAG := -s
		endif
		@@ -687,13 +695,16 @@ INTERNAL_USERIMAGES_DEPS += $(SELINUX_FC)
		define generate-userimage-prop-dictionary
		$(if $(INTERNAL_USERIMAGES_EXT_VARIANT),$(hide) echo "fs_type=$(INTERNAL_USERIMAGES_EXT_VARIANT)" >> $(1))
		$(if $(BOARD_SYSTEMIMAGE_PARTITION_SIZE),$(hide) echo "system_size=$(BOARD_SYSTEMIMAGE_PARTITION_SIZE)" >> $(1))
		$(if $(BOARD_SYSTEMIMAGE_JOURNAL_SIZE),$(hide) echo "system_journal_size=$(BOARD_SYSTEMIMAGE_JOURNAL_SIZE)" >> $(1))
		$(if $(BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "userdata_fs_type=$(BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE)" >> $(1))
		$(if $(BOARD_USERDATAIMAGE_PARTITION_SIZE),$(hide) echo "userdata_size=$(BOARD_USERDATAIMAGE_PARTITION_SIZE)" >> $(1))
		$(if $(BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "cache_fs_type=$(BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE)" >> $(1))
		$(if $(BOARD_CACHEIMAGE_PARTITION_SIZE),$(hide) echo "cache_size=$(BOARD_CACHEIMAGE_PARTITION_SIZE)" >> $(1))
		$(if $(BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "vendor_fs_type=$(BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE)" >> $(1))
		$(if $(BOARD_VENDORIMAGE_PARTITION_SIZE),$(hide) echo "vendor_size=$(BOARD_VENDORIMAGE_PARTITION_SIZE)" >> $(1))
		$(if $(BOARD_VENDORIMAGE_JOURNAL_SIZE),$(hide) echo "vendor_journal_size=$(BOARD_VENDORIMAGE_JOURNAL_SIZE)" >> $(1))
		$(if $(BOARD_OEMIMAGE_PARTITION_SIZE),$(hide) echo "oem_size=$(BOARD_OEMIMAGE_PARTITION_SIZE)" >> $(1))
		$(if $(BOARD_OEMIMAGE_JOURNAL_SIZE),$(hide) echo "oem_journal_size=$(BOARD_OEMIMAGE_JOURNAL_SIZE)" >> $(1))
		$(if $(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG),$(hide) echo "extfs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG)" >> $(1))
		$(hide) echo "selinux_fc=$(SELINUX_FC)" >> $(1)
		$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY),$(hide) echo "verity=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY)" >> $(1))
		@@ -726,12 +737,8 @@ ifneq (,$(PRODUCT_AAPT_PREF_CONFIG))
		# If PRODUCT_AAPT_PREF_CONFIG includes a dpi bucket, then use that value.
		recovery_density := $(filter %dpi,$(PRODUCT_AAPT_PREF_CONFIG))
		else
		# Otherwise, use the highest density that appears in PRODUCT_AAPT_CONFIG.
		# Order is important here; we'll take the first one that's found.
		recovery_densities := $(filter $(PRODUCT_AAPT_CONFIG_SP),xxxhdpi xxhdpi xhdpi hdpi tvdpi mdpi ldpi)
		ifneq (,$(recovery_densities))
		recovery_density := $(word 1,$(recovery_densities))
		endif
		# Otherwise, use the default medium density.
		recovery_densities := mdpi
		endif

		ifneq (,$(wildcard $(recovery_resources_common)-$(recovery_density)))
		@@ -834,7 +841,7 @@ define build-recoveryimage-target
		$(hide) $(MKBOOTFS) $(TARGET_RECOVERY_ROOT_OUT) \| $(MINIGZIP) > $(recovery_ramdisk)
		$(hide) $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $(1)
		$(if $(filter true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY)),\
		$(BOOT_SIGNER) /recovery $(1) $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY) $(1))
		$(BOOT_SIGNER) /recovery $(1) $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8 $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x509.pem $(1))
		$(hide) $(call assert-max-image-size,$(1),$(BOARD_RECOVERYIMAGE_PARTITION_SIZE))
		@echo ----- Made recovery image: $(1) --------
		endef
		@@ -1217,6 +1224,12 @@ vendorimage-nodeps: \| $(INTERNAL_USERIMAGES_DEPS)

		endif # BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE

		# -----------------------------------------------------------------
		# bring in the installer image generation defines if necessary
		ifeq ($(TARGET_USE_DISKINSTALLER),true)
		include bootable/diskinstaller/config.mk
		endif

		# -----------------------------------------------------------------
		# host tools needed to build dist and OTA packages

		@@ -1382,6 +1395,12 @@ ifdef BOARD_BOOTIMAGE_PARTITION_SIZE
		endif
		ifdef BOARD_RECOVERYIMAGE_PARTITION_SIZE
		$(hide) echo "recovery_size=$(BOARD_RECOVERYIMAGE_PARTITION_SIZE)" >> $(zip_root)/META/misc_info.txt
		endif
		ifdef TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS
		@# TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS can be empty to indicate that nothing but defaults should be used.
		$(hide) echo "recovery_mount_options=$(TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS)" >> $(zip_root)/META/misc_info.txt
		else
		$(hide) echo "recovery_mount_options=$(DEFAULT_TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS)" >> $(zip_root)/META/misc_info.txt
		endif
		$(hide) echo "tool_extensions=$(tool_extensions)" >> $(zip_root)/META/misc_info.txt
		$(hide) echo "default_system_dev_certificate=$(DEFAULT_SYSTEM_DEV_CERTIFICATE)" >> $(zip_root)/META/misc_info.txt
		@@ -1392,6 +1411,7 @@ endif
		$(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
		$(hide) echo "blockimgdiff_versions=1,2" >> $(zip_root)/META/misc_info.txt
		ifneq ($(OEM_THUMBPRINT_PROPERTIES),)
		# OTA scripts are only interested in fingerprint related properties
		$(hide) echo "oem_fingerprint_properties=$(OEM_THUMBPRINT_PROPERTIES)" >> $(zip_root)/META/misc_info.txt
		@@ -1484,10 +1504,14 @@ endif
		name := $(name)-symbols-$(FILE_NAME_TAG)

		SYMBOLS_ZIP := $(PRODUCT_OUT)/$(name).zip
		# For apps_only build we'll establish the dependency later in build/core/main.mk.
		ifndef TARGET_BUILD_APPS
		$(SYMBOLS_ZIP): $(INSTALLED_SYSTEMIMAGE) $(INSTALLED_BOOTIMAGE_TARGET)
		endif
		$(SYMBOLS_ZIP):
		@echo "Package symbols: $@"
		$(hide) rm -rf $@
		$(hide) mkdir -p $(dir $@)
		$(hide) mkdir -p $(dir $@) $(TARGET_OUT_UNSTRIPPED)
		$(hide) zip -qr $@ $(TARGET_OUT_UNSTRIPPED)

		# -----------------------------------------------------------------

core/android_manifest.mk

+18 −4

Original line number	Diff line number	Diff line
		@@ -11,13 +11,27 @@ else
		full_android_manifest := $(LOCAL_PATH)/$(LOCAL_MANIFEST_FILE)
		endif

		my_full_libs_manifest_files := $(LOCAL_FULL_LIBS_MANIFEST_FILES)
		my_full_libs_manifest_deps := $(LOCAL_FULL_LIBS_MANIFEST_FILES)

		# Set up dependency on aar libraries
		ifdef LOCAL_STATIC_JAVA_AAR_LIBRARIES
		my_full_libs_manifest_deps += $(foreach lib, $(LOCAL_STATIC_JAVA_AAR_LIBRARIES),\
		$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/aar/classes.jar)
		my_full_libs_manifest_files += $(foreach lib, $(LOCAL_STATIC_JAVA_AAR_LIBRARIES),\
		$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/aar/AndroidManifest.xml)

		LOCAL_RESOURCE_DIR += $(foreach lib, $(LOCAL_STATIC_JAVA_AAR_LIBRARIES),\
		$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/aar/res)
		endif

		# Set up rules to merge library manifest files
		ifdef LOCAL_FULL_LIBS_MANIFEST_FILES
		ifdef my_full_libs_manifest_files
		main_android_manifest := $(full_android_manifest)
		full_android_manifest := $(intermediates.COMMON)/AndroidManifest.xml
		$(full_android_manifest): PRIVATE_LIBS_MANIFESTS := $(LOCAL_FULL_LIBS_MANIFEST_FILES)
		$(full_android_manifest) : $(main_android_manifest) $(LOCAL_FULL_LIBS_MANIFEST_FILES)
		@echo "Merge android manifest files: $@ <-- $^"
		$(full_android_manifest): PRIVATE_LIBS_MANIFESTS := $(my_full_libs_manifest_files)
		$(full_android_manifest) : $(main_android_manifest) $(my_full_libs_manifest_deps)
		@echo "Merge android manifest files: $@ <-- $< $(PRIVATE_LIBS_MANIFESTS)"
		@mkdir -p $(dir $@)
		$(hide) $(ANDROID_MANIFEST_MERGER) --main $< --libs $(PRIVATE_LIBS_MANIFESTS) \
		--out $@

core/apicheck_msg_current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ To make these errors go away, you have two choices:
		errors above.

		2) You can update current.txt by executing the following command:
		make %UPDATE_API%
		make update-api

		To submit the revised current.txt to the main Android repository,
		you will need approval.

core/binary.mk

+18 −1

Original line number	Diff line number	Diff line
		@@ -210,7 +210,9 @@ endif

		####################################################
		## Add FDO flags if FDO is turned on and supported
		####################################################
		## Please note that we will do option filtering during FDO build.
		## i.e. Os->O2, remove -fno-early-inline and -finline-limit.
		##################################################################
		ifeq ($(strip $(LOCAL_FDO_SUPPORT)), true)
		ifeq ($(strip $(LOCAL_IS_HOST_MODULE)),)
		my_cflags += $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_FDO_CFLAGS)
		@@ -992,6 +994,21 @@ my_asflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flag
		my_ldflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(my_ldflags))
		endif

		ifeq ($(LOCAL_FDO_SUPPORT), true)
		build_with_fdo := false
		ifeq ($(BUILD_FDO_INSTRUMENT), true)
		build_with_fdo := true
		endif
		ifeq ($(BUILD_FDO_OPTIMIZE), true)
		build_with_fdo := true
		endif
		ifeq ($(build_with_fdo), true)
		my_cflags := $(patsubst -Os,-O2,$(my_cflags))
		fdo_incompatible_flags=-fno-early-inlining -finline-limit=%
		my_cflags := $(filter-out $(fdo_incompatible_flags),$(my_cflags))
		endif
		endif

		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_YACCFLAGS := $(LOCAL_YACCFLAGS)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ASFLAGS := $(my_asflags)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CONLYFLAGS := $(my_conlyflags)