merge from donut (dc785843) · Commits · e / os / android_build

core/Makefile

+6 −6

Original line number	Diff line number	Diff line
		@@ -299,7 +299,7 @@ else # TARGET_BOOTIMAGE_USE_EXT2 != true
		$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES)
		$(call pretty,"Target boot image: $@")
		$(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) --output $@
		$(hide) $(call assert-max-file-size,$@,$(BOARD_BOOTIMAGE_MAX_SIZE))
		$(hide) $(call assert-max-file-size,$@,$(BOARD_BOOTIMAGE_MAX_SIZE),raw)
		endif # TARGET_BOOTIMAGE_USE_EXT2

		else # TARGET_NO_KERNEL
		@@ -577,7 +577,7 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \
		$(MKBOOTFS) $(TARGET_RECOVERY_ROOT_OUT) \| $(MINIGZIP) > $(recovery_ramdisk)
		$(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) --output $@
		@echo ----- Made recovery image -------- $@
		$(hide) $(call assert-max-file-size,$@,$(BOARD_RECOVERYIMAGE_MAX_SIZE))
		$(hide) $(call assert-max-file-size,$@,$(BOARD_RECOVERYIMAGE_MAX_SIZE),raw)

		else
		INSTALLED_RECOVERYIMAGE_TARGET :=
		@@ -662,7 +662,7 @@ endif
		$(INSTALLED_SYSTEMIMAGE): $(BUILT_SYSTEMIMAGE) $(RECOVERY_FROM_BOOT_PATCH) \| $(ACP)
		@echo "Install system fs image: $@"
		$(copy-file-to-target)
		$(hide) $(call assert-max-file-size,$@ $(RECOVERY_FROM_BOOT_PATCH),$(BOARD_SYSTEMIMAGE_MAX_SIZE))
		$(hide) $(call assert-max-file-size,$@ $(RECOVERY_FROM_BOOT_PATCH),$(BOARD_SYSTEMIMAGE_MAX_SIZE),yaffs)

		systemimage: $(INSTALLED_SYSTEMIMAGE)

		@@ -671,7 +671,7 @@ systemimage-nodeps snod: $(filter-out systemimage-nodeps snod,$(MAKECMDGOALS)) \
		\| $(INTERNAL_MKUSERFS)
		@echo "make $@: ignoring dependencies"
		$(call build-systemimage-target,$(INSTALLED_SYSTEMIMAGE))
		$(hide) $(call assert-max-file-size,$(INSTALLED_SYSTEMIMAGE),$(BOARD_SYSTEMIMAGE_MAX_SIZE))
		$(hide) $(call assert-max-file-size,$(INSTALLED_SYSTEMIMAGE),$(BOARD_SYSTEMIMAGE_MAX_SIZE),yaffs)

		#######
		## system tarball
		@@ -708,7 +708,7 @@ define build-userdataimage-target
		$(call pretty,"Target userdata fs image: $(INSTALLED_USERDATAIMAGE_TARGET)")
		@mkdir -p $(TARGET_OUT_DATA)
		$(call build-userimage-ext2-target,$(TARGET_OUT_DATA),$(INSTALLED_USERDATAIMAGE_TARGET),userdata,)
		$(hide) $(call assert-max-file-size,$(INSTALLED_USERDATAIMAGE_TARGET),$(BOARD_USERDATAIMAGE_MAX_SIZE))
		$(hide) $(call assert-max-file-size,$(INSTALLED_USERDATAIMAGE_TARGET),$(BOARD_USERDATAIMAGE_MAX_SIZE),yaffs)
		endef

		else # TARGET_USERIMAGES_USE_EXT2 != true
		@@ -718,7 +718,7 @@ define build-userdataimage-target
		$(call pretty,"Target userdata fs image: $(INSTALLED_USERDATAIMAGE_TARGET)")
		@mkdir -p $(TARGET_OUT_DATA)
		$(hide) $(MKYAFFS2) -f $(TARGET_OUT_DATA) $(INSTALLED_USERDATAIMAGE_TARGET)
		$(hide) $(call assert-max-file-size,$(INSTALLED_USERDATAIMAGE_TARGET),$(BOARD_USERDATAIMAGE_MAX_SIZE))
		$(hide) $(call assert-max-file-size,$(INSTALLED_USERDATAIMAGE_TARGET),$(BOARD_USERDATAIMAGE_MAX_SIZE),yaffs)
		endef
		endif # TARGET_USERIMAGES_USE_EXT2

core/clear_vars.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ LOCAL_PREBUILT_LIBS:=
		LOCAL_PREBUILT_EXECUTABLES:=
		LOCAL_PREBUILT_JAVA_LIBRARIES:=
		LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES:=
		LOCAL_PREBUILT_STRIP_COMMENTS:=
		LOCAL_INTERMEDIATE_SOURCES:=
		LOCAL_JAVA_LIBRARIES:=
		LOCAL_NO_STANDARD_LIBRARIES:=

core/definitions.mk

+33 −1

Original line number	Diff line number	Diff line
		@@ -1469,6 +1469,19 @@ define copy-file-to-target-with-cp
		$(hide) cp -fp $< $@
		endef

		# The same as copy-file-to-target, but use the zipalign tool to do so.
		define copy-file-to-target-with-zipalign
		@mkdir -p $(dir $@)
		$(hide) $(ZIPALIGN) -f 4 $< $@
		endef

		# The same as copy-file-to-target, but strip out "# comment"-style
		# comments (for config files and such).
		define copy-file-to-target-strip-comments
		@mkdir -p $(dir $@)
		$(hide) sed -e 's/#.$$//' -e 's/[ \t]$$//' -e '/^$$/d' < $< > $@
		endef

		# The same as copy-file-to-target, but don't preserve
		# the old modification time.
		define copy-file-to-new-target
		@@ -1489,6 +1502,18 @@ define transform-prebuilt-to-target
		$(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) Prebuilt APK: $(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) Prebuilt: $(PRIVATE_MODULE) ($@)"
		$(copy-file-to-target-strip-comments)
		endef


		###########################################################
		## On some platforms (MacOS), after copying a static
		@@ -1547,6 +1572,7 @@ endef

		# $(1): The file(s) to check (often $@)
		# $(2): The maximum total image size, in decimal bytes
		# $(3): the type of filesystem "yaffs" or "raw"
		#
		# If $(2) is empty, evaluates to "true"
		#
		@@ -1560,9 +1586,15 @@ $(if $(2), \
		printname=$$(echo -n "$(1)" \| tr " " +); \
		echo "$$printname total size is $$total"; \
		img_blocksize=$(call image-size-from-data-size,$(BOARD_FLASH_BLOCK_SIZE)); \
		if [ "$(3)" == "yaffs" ]; then \
		reservedblocks=5; \
		else \
		reservedblocks=0; \
		fi; \
		twoblocks=$$((img_blocksize * 2)); \
		onepct=$$((((($(2) / 100) - 1) / img_blocksize + 1) * img_blocksize)); \
		reserve=$$((twoblocks > onepct ? twoblocks : onepct)); \
		reserve=$$(((twoblocks > onepct ? twoblocks : onepct) + \
		reservedblocks * img_blocksize)); \
		maxsize=$$(($(2) - reserve)); \
		if [ "$$total" -gt "$$maxsize" ]; then \
		echo "error: $$printname too large ($$total > [$(2) - $$reserve])"; \

core/main.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -339,6 +339,7 @@ ifeq ($(SDK_ONLY),true)
		subdirs := \
		prebuilt \
		build/libs/host \
		build/tools/zipalign \
		dalvik/dexdump \
		dalvik/libdex \
		dalvik/tools/dmtracedump \
		@@ -366,7 +367,6 @@ ifneq (,$(shell which javac 2>/dev/null))
		$(warning sdk-only: javac available.)
		subdirs += \
		build/tools/signapk \
		build/tools/zipalign \
		dalvik/dx \
		dalvik/libcore \
		development/apps \

core/prebuilt.mk

+28 −1

Original line number	Diff line number	Diff line
		@@ -26,8 +26,35 @@ else
		prebuilt_module_is_a_library :=
		endif

		# Ensure that prebuilt .apks have been aligned.
		ifneq ($(filter APPS,$(LOCAL_MODULE_CLASS)),)
		$(LOCAL_BUILT_MODULE) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) \| $(ZIPALIGN)
		$(transform-prebuilt-to-target-with-zipalign)
		else
		ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),)
		$(LOCAL_BUILT_MODULE) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES)
		$(transform-prebuilt-to-target-strip-comments)
		else
		$(LOCAL_BUILT_MODULE) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) \| $(ACP)
		$(transform-prebuilt-to-target)
		endif
		endif

		ifeq ($(LOCAL_CERTIFICATE),)
		# can't re-sign this package, so predexopt is not available.
		else

		# If this is not an absolute certificate, assign it to a generic one.
		ifeq ($(dir $(strip $(LOCAL_CERTIFICATE))),./)
		LOCAL_CERTIFICATE := $(SRC_TARGET_DIR)/product/security/$(LOCAL_CERTIFICATE)
		endif

		PACKAGES.$(LOCAL_MODULE).PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8
		PACKAGES.$(LOCAL_MODULE).CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem
		PACKAGES := $(PACKAGES) $(LOCAL_MODULE)

		endif

		ifneq ($(prebuilt_module_is_a_library),)
		ifneq ($(LOCAL_IS_HOST_MODULE),)
		$(transform-host-ranlib-copy-hack)