Merge branch 'gingerbread' of git://android.git.kernel.org/platform/build into upstream-2.3.5 (7ecf49d2) · Commits · e / os / android_build

CleanSpec.mk

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -54,6 +54,10 @@ $(call add-clean-step, find $(PRODUCT_OUT) -name "*.apk" \| xargs rm)
	$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
	$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
	$(call add-clean-step, rm -rf $(OUT_DIR))		$(call add-clean-step, rm -rf $(OUT_DIR))
			$(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/*)


	# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST		# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
	# ************************************************		# ************************************************

core/config.mk

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -268,6 +268,12 @@ else
	HOST_JDK_TOOLS_JAR:= $(shell $(BUILD_SYSTEM)/find-jdk-tools-jar.sh)		HOST_JDK_TOOLS_JAR:= $(shell $(BUILD_SYSTEM)/find-jdk-tools-jar.sh)
	endif		endif

			# Is the host JDK 64-bit version?
			HOST_JDK_IS_64BIT_VERSION :=
			ifneq ($(filter 64-Bit, $(shell java -version 2>&1)),)
			HOST_JDK_IS_64BIT_VERSION := true
			endif

	# It's called md5 on Mac OS and md5sum on Linux		# It's called md5 on Mac OS and md5sum on Linux
	ifeq ($(HOST_OS),darwin)		ifeq ($(HOST_OS),darwin)
	MD5SUM:=md5 -q		MD5SUM:=md5 -q

core/main.mk

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -70,17 +70,6 @@ ifneq ($(VERSION_CHECK_SEQUENCE_NUMBER),$(VERSIONS_CHECKED))

	$(info Checking build tools versions...)		$(info Checking build tools versions...)

	ifeq ($(BUILD_OS),linux)
	build_arch := $(shell uname -m)
	ifneq (64,$(findstring 64,$(build_arch)))
	$(warning ************************************************************)
	$(warning You are attempting to build on a 32-bit system.)
	$(warning Only 64-bit build environments are supported beyond froyo/2.2.)
	$(warning ************************************************************)
	BUILDING_ON_32BIT := true
	endif
	endif

	ifneq ($(HOST_OS),windows)		ifneq ($(HOST_OS),windows)
	ifneq ($(HOST_OS)-$(HOST_ARCH),darwin-ppc)		ifneq ($(HOST_OS)-$(HOST_ARCH),darwin-ppc)
	# check for a case sensitive file system		# check for a case sensitive file system

core/prebuilt.mk

+22 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,16 @@ ifneq ($(LOCAL_PREBUILT_JAVA_LIBRARIES),)
	$(error dont use LOCAL_PREBUILT_JAVA_LIBRARIES anymore LOCAL_PATH=$(LOCAL_PATH))		$(error dont use LOCAL_PREBUILT_JAVA_LIBRARIES anymore LOCAL_PATH=$(LOCAL_PATH))
	endif		endif

			ifneq ($(filter APPS,$(LOCAL_MODULE_CLASS)),)
			ifeq (true,$(WITH_DEXPREOPT))
			ifeq (,$(TARGET_BUILD_APPS))
			ifndef LOCAL_DEX_PREOPT
			LOCAL_DEX_PREOPT := true
			endif
			endif
			endif
			endif

	include $(BUILD_SYSTEM)/base_rules.mk		include $(BUILD_SYSTEM)/base_rules.mk

	# Deal with the OSX library timestamp issue when installing		# Deal with the OSX library timestamp issue when installing
	@@ -30,8 +40,20 @@ PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))

	# Ensure that prebuilt .apks have been aligned.		# Ensure that prebuilt .apks have been aligned.
	ifneq ($(filter APPS,$(LOCAL_MODULE_CLASS)),)		ifneq ($(filter APPS,$(LOCAL_MODULE_CLASS)),)
			ifeq ($(LOCAL_DEX_PREOPT),true)
			# Make sure the boot jars get dexpreopt-ed first
			$(LOCAL_BUILT_MODULE): $(DEXPREOPT_BOOT_ODEXS) \| $(DEXPREOPT) $(DEXOPT) $(AAPT)
			endif
	$(LOCAL_BUILT_MODULE) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) \| $(ZIPALIGN)		$(LOCAL_BUILT_MODULE) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) \| $(ZIPALIGN)
	$(transform-prebuilt-to-target-with-zipalign)		$(transform-prebuilt-to-target-with-zipalign)
			ifeq ($(LOCAL_DEX_PREOPT),true)
			$(hide) rm -f $(patsubst %.apk,%.odex,$@)
			$(call dexpreopt-one-file,$@,$(patsubst %.apk,%.odex,$@))
			$(call dexpreopt-remove-classes.dex,$@)

			built_odex := $(basename $(LOCAL_BUILT_MODULE)).odex
			$(built_odex): $(LOCAL_BUILT_MODULE)
			endif
	else		else
	ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),)		ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),)
	$(LOCAL_BUILT_MODULE) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES)		$(LOCAL_BUILT_MODULE) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES)

core/version_defaults.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -41,7 +41,7 @@ ifeq "" "$(PLATFORM_VERSION)"
	# which is the version that we reveal to the end user.		# which is the version that we reveal to the end user.
	# Update this value when the platform version changes (rather		# Update this value when the platform version changes (rather
	# than overriding it somewhere else). Can be an arbitrary string.		# than overriding it somewhere else). Can be an arbitrary string.
	PLATFORM_VERSION := 2.3.4		PLATFORM_VERSION := 2.3.5
	endif		endif

	ifeq "" "$(PLATFORM_SDK_VERSION)"		ifeq "" "$(PLATFORM_SDK_VERSION)"