merge from donut (7227ea76) · Commits · e / os / android_build

core/base_rules.mk

+21 −3

Original line number	Diff line number	Diff line
		@@ -392,6 +392,25 @@ endif

		endif # !LOCAL_UNINSTALLABLE_MODULE


		###########################################################
		## CHECK_BUILD goals
		###########################################################

		# If nobody has defined a more specific module for the
		# checked modules, use LOCAL_BUILT_MODULE. This was old
		# behavior, so it should be a safe default.
		ifndef LOCAL_CHECKED_MODULE
		LOCAL_CHECKED_MODULE := $(LOCAL_BUILT_MODULE)
		endif

		# If they request that this module not be checked, then don't.
		# PLEASE DON'T SET THIS. ANY PLACES THAT SET THIS WITHOUT
		# GOOD REASON WILL HAVE IT REMOVED.
		ifdef LOCAL_DONT_CHECK_MODULE
		LOCAL_CHECKED_MODULE :=
		endif

		###########################################################
		## Register with ALL_MODULES
		###########################################################
		@@ -404,6 +423,8 @@ ALL_MODULES.$(LOCAL_MODULE).PATH := \
		$(ALL_MODULES.$(LOCAL_MODULE).PATH) $(LOCAL_PATH)
		ALL_MODULES.$(LOCAL_MODULE).TAGS := \
		$(ALL_MODULES.$(LOCAL_MODULE).TAGS) $(LOCAL_MODULE_TAGS)
		ALL_MODULES.$(LOCAL_MODULE).CHECKED := \
		$(ALL_MODULES.$(LOCAL_MODULE).CHECKED) $(LOCAL_CHECKED_MODULE)
		ALL_MODULES.$(LOCAL_MODULE).BUILT := \
		$(ALL_MODULES.$(LOCAL_MODULE).BUILT) $(LOCAL_BUILT_MODULE)
		ALL_MODULES.$(LOCAL_MODULE).INSTALLED := \
		@@ -430,9 +451,6 @@ $(foreach tag,$(LOCAL_MODULE_TAGS),\
		$(foreach tag,$(LOCAL_MODULE_TAGS),\
		$(eval ALL_MODULE_NAME_TAGS.$(tag) += $(LOCAL_MODULE)))

		# Always build everything, but only install a subset.
		ALL_BUILT_MODULES += $(LOCAL_BUILT_MODULE)

		###########################################################
		## NOTICE files
		###########################################################

core/clear_vars.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,8 @@
		LOCAL_MODULE:=
		LOCAL_MODULE_PATH:=
		LOCAL_MODULE_STEM:=
		LOCAL_DONT_CHECK_MODULE:=
		LOCAL_CHECKED_MODULE:=
		LOCAL_BUILT_MODULE:=
		LOCAL_BUILT_MODULE_STEM:=
		OVERRIDE_BUILT_MODULE_PATH:=

core/combo/linux-x86.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ $(combo_target)AR := $(AR)
		ifeq ($(combo_target),HOST_)
		# $(1): The file to check
		define get-file-size
		stat --format "%s" "$(1)"
		stat --format "%s" "$(1)" \| tr -d '\n'
		endef
		endif

core/config.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -78,8 +78,8 @@ SHOW_COMMANDS:= $(filter showcommands,$(MAKECMDGOALS))
		COMMON_GLOBAL_CFLAGS:= -DANDROID -fmessage-length=0 -W -Wall -Wno-unused
		COMMON_RELEASE_CFLAGS:= -DNDEBUG -UDEBUG

		COMMON_GLOBAL_CPPFLAGS:=
		COMMON_RELEASE_CPPFLAGS:=
		COMMON_GLOBAL_CPPFLAGS:= -DANDROID -fmessage-length=0 -W -Wall -Wno-unused -Wnon-virtual-dtor
		COMMON_RELEASE_CPPFLAGS:= -DNDEBUG -UDEBUG

		# Set the extensions used for various packages
		COMMON_PACKAGE_SUFFIX := .zip

core/definitions.mk

+10 −14

Original line number	Diff line number	Diff line
		@@ -41,9 +41,6 @@ ALL_MODULES:=
		# set of installed targets.
		ALL_DEFAULT_INSTALLED_MODULES:=

		# Full paths to all targets that will be built.
		ALL_BUILT_MODULES:=

		# The list of tags that have been defined by
		# LOCAL_MODULE_TAGS. Each word in this variable maps
		# to a corresponding ALL_MODULE_TAGS.<tagname> variable
		@@ -1239,21 +1236,21 @@ $(hide) rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR)
		$(hide) mkdir -p $(PRIVATE_CLASS_INTERMEDIATES_DIR)
		$(call unzip-jar-files,$(PRIVATE_STATIC_JAVA_LIBRARIES), \
		$(PRIVATE_CLASS_INTERMEDIATES_DIR))
		$(call dump-words-to-file,$(PRIVATE_JAVA_SOURCES),$(PRIVATE_INTERMEDIATES_DIR)/java-source-list)
		$(call dump-words-to-file,$(PRIVATE_JAVA_SOURCES),$(dir $(PRIVATE_CLASS_INTERMEDIATES_DIR))/java-source-list)
		$(hide) if [ -d "$(PRIVATE_SOURCE_INTERMEDIATES_DIR)" ]; then \
		find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name '*.java' >> $(PRIVATE_INTERMEDIATES_DIR)/java-source-list; \
		find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name '*.java' >> $(dir $(PRIVATE_CLASS_INTERMEDIATES_DIR))/java-source-list; \
		fi
		$(hide) tr ' ' '\n' < $(PRIVATE_INTERMEDIATES_DIR)/java-source-list \
		\| sort -u > $(PRIVATE_INTERMEDIATES_DIR)/java-source-list-uniq
		$(hide) tr ' ' '\n' < $(dir $(PRIVATE_CLASS_INTERMEDIATES_DIR))/java-source-list \
		\| sort -u > $(dir $(PRIVATE_CLASS_INTERMEDIATES_DIR))/java-source-list-uniq
		$(hide) $(TARGET_JAVAC) -encoding ascii $(PRIVATE_BOOTCLASSPATH) \
		$(addprefix -classpath ,$(strip \
		$(call normalize-path-list,$(PRIVATE_ALL_JAVA_LIBRARIES)))) \
		$(strip $(PRIVATE_JAVAC_DEBUG_FLAGS)) $(xlint_unchecked) \
		-extdirs "" -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) \
		\@$(PRIVATE_INTERMEDIATES_DIR)/java-source-list-uniq \
		\@$(dir $(PRIVATE_CLASS_INTERMEDIATES_DIR))/java-source-list-uniq \
		\|\| ( rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) ; exit 41 )
		$(hide) rm -f $(PRIVATE_INTERMEDIATES_DIR)/java-source-list
		$(hide) rm -f $(PRIVATE_INTERMEDIATES_DIR)/java-source-list-uniq
		$(hide) rm -f $(dir $(PRIVATE_CLASS_INTERMEDIATES_DIR))/java-source-list
		$(hide) rm -f $(dir $(PRIVATE_CLASS_INTERMEDIATES_DIR))/java-source-list-uniq
		$(hide) mkdir -p $(dir $@)
		$(hide) jar $(if $(strip $(PRIVATE_JAR_MANIFEST)),-cfm,-cf) \
		$@ $(PRIVATE_JAR_MANIFEST) -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) .
		@@ -1558,8 +1555,8 @@ endef
		# next whole flash block size.
		define assert-max-file-size
		$(if $(2), \
		size=$$(for i in $(1); do $(call get-file-size,$$i); done); \
		total=$$(( $$( echo "$$size" \| tr '\n' + ; echo 0 ) )); \
		size=$$(for i in $(1); do $(call get-file-size,$$i); echo +; done; echo 0); \
		total=$$(( $$( echo "$$size" ) )); \
		printname=$$(echo -n "$(1)" \| tr " " +); \
		echo "$$printname total size is $$total"; \
		img_blocksize=$(call image-size-from-data-size,$(BOARD_FLASH_BLOCK_SIZE)); \
		@@ -1570,8 +1567,7 @@ $(if $(2), \
		if [ "$$total" -gt "$$maxsize" ]; then \
		echo "error: $$printname too large ($$total > [$(2) - $$reserve])"; \
		false; \
		fi; \
		if [ "$$total" -gt $$((maxsize - 32768)) ]; then \
		elif [ "$$total" -gt $$((maxsize - 32768)) ]; then \
		echo "WARNING: $$printname approaching size limit ($$total now; limit $$maxsize)"; \
		fi \
		, \