eclair snapshot (e6b4e5b2) · Commits · e / os / android_build

buildspec.mk.default

+32 −17

Original line number	Diff line number	Diff line
		@@ -21,6 +21,30 @@
		# "buildspec.mk" should never be checked in to source control.
		######################################################################

		# Choose a product to build for. Look in the products directory for ones
		# that work.
		ifndef TARGET_PRODUCT
		#TARGET_PRODUCT:=generic
		endif

		# Choose a variant to build. If you don't pick one, the default is eng.
		# User is what we ship. Userdebug is that, with a few flags turned on
		# for debugging. Eng has lots of extra tools for development.
		ifndef TARGET_BUILD_VARIANT
		#TARGET_BUILD_VARIANT:=user
		#TARGET_BUILD_VARIANT:=userdebug
		#TARGET_BUILD_VARIANT:=eng
		endif

		# Choose additional targets to always install, even when building
		# minimal targets like "make droid". This takes simple target names
		# like "Browser" or "MyApp", the names used by LOCAL_MODULE or
		# LOCAL_PACKAGE_NAME. Modules listed here will always be installed in
		# /system, even if they'd usually go in /data.
		ifndef CUSTOM_MODULES
		#CUSTOM_MODULES:=
		endif

		# Uncomment this if you want the simulator, otherwise, build for arm
		ifndef TARGET_SIMULATOR
		#TARGET_SIMULATOR:=true
		@@ -50,21 +74,6 @@ endif
		#HOST_CUSTOM_DEBUG_CFLAGS:=
		#TARGET_CUSTOM_DEBUG_CFLAGS:=

		# Choose a product to build for. Look in the products directory for ones
		# that work.
		ifndef TARGET_PRODUCT
		#TARGET_PRODUCT:=generic
		endif

		# Choose additional targets to always install, even when building
		# minimal targets like "make droid". This takes simple target names
		# like "Browser" or "MyApp", the names used by LOCAL_MODULE or
		# LOCAL_PACKAGE_NAME. Modules listed here will always be installed in
		# /system, even if they'd usually go in /data.
		ifndef CUSTOM_MODULES
		#CUSTOM_MODULES:=
		endif

		# Choose additional locales, like "en_US" or "it_IT", to add to any
		# built product. Any locales that appear in CUSTOM_LOCALES but not in
		# the locale list for the selected product will be added to the end
		@@ -88,10 +97,16 @@ ifndef NO_FALLBACK_FONT
		#NO_FALLBACK_FONT:=true
		endif

		# To enabled instrumentation in webcore based apps like gmail and
		# To enable instrumentation in webcore based apps like gmail and
		# the browser, define WEBCORE_INSTRUMENTATION:=true
		ifndef WEBCORE_INSTRUMENTATION
		#WEBCORE_INSTRUMENTATION:=true
		#endif
		endif

		# To enable SVG in webcore define ENABLE_SVG:=true
		ifndef ENABLE_SVG
		#ENABLE_SVG:=true
		endif

		# when the build system changes such that this file must be updated, this
		# variable will be changed. After you have modified this file with the new

cleanspec.mk

+5 −33

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@
		# WHEN DOING SO, DELETE ANY "add-clean-step" ENTRIES THAT HAVE PILED UP.
		# **********************************************************************
		#
		INTERNAL_CLEAN_BUILD_VERSION := 2
		INTERNAL_CLEAN_BUILD_VERSION := 3
		#
		# ***********************************************************************
		# Do not touch INTERNAL_CLEAN_BUILD_VERSION if you've added a clean step!
		@@ -31,7 +31,7 @@ INTERNAL_CLEAN_BUILD_VERSION := 2
		#
		# E.g.:
		# $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
		# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/external/zlib/)
		# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
		#
		# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
		# files that are missing or have been moved.
		@@ -54,38 +54,10 @@ INTERNAL_CLEAN_BUILD_VERSION := 2
		#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
		#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 \| xargs -0 rm -f)
		#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libwebcore_intermediates)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_intermediates)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)

		$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/etc/NOTICE.html)
		# Remove generated java files after CL 126153
		$(call add-clean-step, find $(OUT_DIR) -type f -name "*.java" -print0 \| xargs -0 rm -f)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/sapphire/obj/SHARED_LIBRARIES/libhardware_legacy_intermediates/led)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/mountd)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/mountd.conf)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Browser_intermediates)
		$(call add-clean-step, rm -f vendor/google/apps/Talk/res/drawable/%*)
		$(call add-clean-step, rm -rf $(OUT_DIR)/product/*/obj/SHARED_LIBRARIES/libandroid_runtime_intermediates/android_os_NetStat.o)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/SHARED_LIBRARIES/libjni_andpyime_intermediates)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/SHARED_LIBRARIES/share)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/SHARED_LIBRARIES/libwebcore_intermediates)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/PinyinIME_intermediates)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/com.android.inputmethod.pinyin.lib_intermediates)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/PinyinIMEGoogleService_intermediates)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/com.android.inputmethod.pinyin.lib_intermediates)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/PinyinIMEGoogleService_intermediates)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj)
		$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/bin/tcpdump)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/location)

		$(call add-clean-step, rm -rf $(OUT_DIR)/product/*/obj/SHARED_LIBRARIES/lib?camera_intermediates)
		$(call add-clean-step, rm -rf $(OUT_DIR)/product/*/obj/STATIC_LIBRARIES/lib?camera_intermediates)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/SHARED_LIBRARIES/libwebcore_intermediates)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/ringtones/Silence.ogg)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/ringtones/notifications/Silence.ogg)
		# ************************************************
		# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
		# ************************************************

core/Makefile

+44 −15

Original line number	Diff line number	Diff line
		@@ -118,6 +118,7 @@ $(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE)
		PRODUCT_BRAND="$(PRODUCT_BRAND)" \
		PRODUCT_DEFAULT_LANGUAGE="$(call default-locale-language,$(PRODUCT_LOCALES))" \
		PRODUCT_DEFAULT_REGION="$(call default-locale-region,$(PRODUCT_LOCALES))" \
		PRODUCT_DEFAULT_WIFI_CHANNELS="$(PRODUCT_DEFAULT_WIFI_CHANNELS)" \
		PRODUCT_MODEL="$(PRODUCT_MODEL)" \
		PRODUCT_MANUFACTURER="$(PRODUCT_MANUFACTURER)" \
		PRIVATE_BUILD_DESC="$(PRIVATE_BUILD_DESC)" \
		@@ -299,7 +300,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),raw)
		$(hide) $(call assert-max-image-size,$@,$(BOARD_BOOTIMAGE_PARTITION_SIZE),raw)
		endif # TARGET_BOOTIMAGE_USE_EXT2

		else # TARGET_NO_KERNEL
		@@ -501,7 +502,7 @@ endif
		# Recovery image

		# If neither TARGET_NO_KERNEL nor TARGET_NO_RECOVERY are true
		ifeq (,$(filter true, $(TARGET_NO_KERNEL) $(TARGET_NO_RECOVERY)))
		ifeq (,$(filter true, $(TARGET_NO_KERNEL) $(TARGET_NO_RECOVERY) $(BUILD_TINY_ANDROID)))

		INSTALLED_RECOVERYIMAGE_TARGET := $(PRODUCT_OUT)/recovery.img

		@@ -577,7 +578,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),raw)
		$(hide) $(call assert-max-image-size,$@,$(BOARD_RECOVERYIMAGE_PARTITION_SIZE),raw)

		else
		INSTALLED_RECOVERYIMAGE_TARGET :=
		@@ -662,7 +663,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),yaffs)
		$(hide) $(call assert-max-image-size,$@ $(RECOVERY_FROM_BOOT_PATCH),$(BOARD_SYSTEMIMAGE_PARTITION_SIZE),yaffs)

		systemimage: $(INSTALLED_SYSTEMIMAGE)

		@@ -671,7 +672,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),yaffs)
		$(hide) $(call assert-max-image-size,$(INSTALLED_SYSTEMIMAGE),$(BOARD_SYSTEMIMAGE_PARTITION_SIZE),yaffs)

		#######
		## system tarball
		@@ -708,7 +709,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),yaffs)
		$(hide) $(call assert-max-image-size,$(INSTALLED_USERDATAIMAGE_TARGET),$(BOARD_USERDATAIMAGE_PARTITION_SIZE),yaffs)
		endef

		else # TARGET_USERIMAGES_USE_EXT2 != true
		@@ -718,7 +719,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),yaffs)
		$(hide) $(call assert-max-image-size,$(INSTALLED_USERDATAIMAGE_TARGET),$(BOARD_USERDATAIMAGE_PARTITION_SIZE),yaffs)
		endef
		endif # TARGET_USERIMAGES_USE_EXT2

		@@ -813,6 +814,13 @@ $(BUILT_TARGET_FILES_PACKAGE): PRIVATE_OTA_TOOLS := $(built_ota_tools)

		$(BUILT_TARGET_FILES_PACKAGE): PRIVATE_RECOVERY_API_VERSION := $(RECOVERY_API_VERSION)

		ifeq ($(TARGET_RELEASETOOLS_EXTENSIONS),)
		# default to common dir for device vendor
		$(BUILT_TARGET_FILES_PACKAGE): tool_extensions := $(TARGET_DEVICE_DIR)/../common
		else
		$(BUILT_TARGET_FILES_PACKAGE): tool_extensions := $(TARGET_RELEASETOOLS_EXTENSIONS)
		endif

		# Depending on the various images guarantees that the underlying
		# directories are up-to-date.
		$(BUILT_TARGET_FILES_PACKAGE): \
		@@ -841,6 +849,9 @@ ifdef INSTALLED_2NDBOOTLOADER_TARGET
		endif
		ifdef BOARD_KERNEL_CMDLINE
		$(hide) echo "$(BOARD_KERNEL_CMDLINE)" > $(zip_root)/RECOVERY/cmdline
		endif
		ifdef BOARD_KERNEL_BASE
		$(hide) echo "$(BOARD_KERNEL_BASE)" > $(zip_root)/RECOVERY/base
		endif
		@# Components of the boot image
		$(hide) mkdir -p $(zip_root)/BOOT
		@@ -856,11 +867,12 @@ endif
		ifdef BOARD_KERNEL_CMDLINE
		$(hide) echo "$(BOARD_KERNEL_CMDLINE)" > $(zip_root)/BOOT/cmdline
		endif
		ifdef INSTALLED_RADIOIMAGE_TARGET
		@# The radio image
		$(hide) mkdir -p $(zip_root)/RADIO
		$(hide) $(ACP) $(INSTALLED_RADIOIMAGE_TARGET) $(zip_root)/RADIO/image
		ifdef BOARD_KERNEL_BASE
		$(hide) echo "$(BOARD_KERNEL_BASE)" > $(zip_root)/BOOT/base
		endif
		$(hide) $(foreach t,$(INSTALLED_RADIOIMAGE_TARGET),\
		mkdir -p $(zip_root)/RADIO; \
		$(ACP) $(t) $(zip_root)/RADIO/$(notdir $(t));)
		@# Contents of the system image
		$(hide) $(call package_files-copy-root, \
		$(SYSTEMIMAGE_SOURCE_DIR),$(zip_root)/SYSTEM)
		@@ -878,10 +890,11 @@ endif
		$(hide) echo "$(PRODUCT_OTA_PUBLIC_KEYS)" > $(zip_root)/META/otakeys.txt
		$(hide) echo "$(PRIVATE_RECOVERY_API_VERSION)" > $(zip_root)/META/recovery-api-version.txt
		$(hide) echo "blocksize $(BOARD_FLASH_BLOCK_SIZE)" > $(zip_root)/META/imagesizes.txt
		$(hide) echo "boot $(BOARD_BOOTIMAGE_MAX_SIZE)" >> $(zip_root)/META/imagesizes.txt
		$(hide) echo "recovery $(BOARD_RECOVERYIMAGE_MAX_SIZE)" >> $(zip_root)/META/imagesizes.txt
		$(hide) echo "system $(BOARD_SYSTEMIMAGE_MAX_SIZE)" >> $(zip_root)/META/imagesizes.txt
		$(hide) echo "userdata $(BOARD_USERDATAIMAGE_MAX_SIZE)" >> $(zip_root)/META/imagesizes.txt
		$(hide) echo "boot $(call image-size-from-data-size,$(BOARD_BOOTIMAGE_PARTITION_SIZE))" >> $(zip_root)/META/imagesizes.txt
		$(hide) echo "recovery $(call image-size-from-data-size,$(BOARD_RECOVERYIMAGE_PARTITION_SIZE))" >> $(zip_root)/META/imagesizes.txt
		$(hide) echo "system $(call image-size-from-data-size,$(BOARD_SYSTEMIMAGE_PARTITION_SIZE))" >> $(zip_root)/META/imagesizes.txt
		$(hide) echo "userdata $(call image-size-from-data-size,$(BOARD_USERDATAIMAGE_PARTITION_SIZE))" >> $(zip_root)/META/imagesizes.txt
		$(hide) echo "$(tool_extensions)" > $(zip_root)/META/tool-extensions.txt
		@# Zip everything up, preserving symlinks
		$(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .)

		@@ -904,9 +917,17 @@ INTERNAL_OTA_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip

		$(INTERNAL_OTA_PACKAGE_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR)

		ifeq ($(TARGET_OTA_SCRIPT_MODE),)
		# default to "auto"
		$(INTERNAL_OTA_PACKAGE_TARGET): scriptmode := auto
		else
		$(INTERNAL_OTA_PACKAGE_TARGET): scriptmode := $(TARGET_OTA_SCRIPT_MODE)
		endif

		$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) otatools
		@echo "Package OTA: $@"
		$(hide) ./build/tools/releasetools/ota_from_target_files \
		-m $(scriptmode) \
		-p $(HOST_OUT) \
		-k $(KEY_CERT_PAIR) \
		$(BUILT_TARGET_FILES_PACKAGE) $@
		@@ -1030,9 +1051,17 @@ name := $(name)-img-$(FILE_NAME_TAG)

		INTERNAL_UPDATE_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip

		ifeq ($(TARGET_RELEASETOOLS_EXTENSIONS),)
		# default to common dir for device vendor
		$(INTERNAL_UPDATE_PACKAGE_TARGET): extensions := $(TARGET_DEVICE_DIR)/../common
		else
		$(INTERNAL_UPDATE_PACKAGE_TARGET): extensions := $(TARGET_RELEASETOOLS_EXTENSIONS)
		endif

		$(INTERNAL_UPDATE_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) otatools
		@echo "Package: $@"
		$(hide) ./build/tools/releasetools/img_from_target_files \
		-s $(extensions) \
		-p $(HOST_OUT) \
		$(BUILT_TARGET_FILES_PACKAGE) $@

core/apicheck_msg_current.txt

+2 −2

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

		2) You can update current.xml by executing the following command:

		make update-api

		To check in the revised current.xml, you will need approval from the android API council.
		To submit the revised current.xml to the main Android repository,
		you will need approval.
		******************************

core/base_rules.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -272,8 +272,10 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SOURCE_INTERMEDIATES_DIR := $(intermediat
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAVA_SOURCES := $(all_java_sources)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAVA_OBJECTS := $(patsubst %.java,%.class,$(LOCAL_SRC_FILES))
		ifeq ($(my_prefix),TARGET_)
		ifeq ($(LOCAL_SDK_VERSION),)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-files,core)
		endif
		endif
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RESOURCE_DIR := $(LOCAL_RESOURCE_DIR)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_EXTRA_JAR_ARGS := $(extra_jar_args)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ASSET_DIR := $(LOCAL_ASSET_DIR)
		@@ -350,7 +352,6 @@ $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_PATH:=$(LOCAL_PATH)
		$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_POST_PROCESS_COMMAND:= $(LOCAL_POST_PROCESS_COMMAND)
		$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_AAPT_FLAGS:= $(LOCAL_AAPT_FLAGS)
		$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_JAVA_LIBRARIES:= $(LOCAL_JAVA_LIBRARIES)
		#TODO: add this: $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_ADDITIONAL_DEPENDENCIES:= $(LOCAL_ADDITIONAL_DEPENDENCIES)

		$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_ALL_JAVA_LIBRARIES:= $(full_java_libs)
		$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_IS_HOST_MODULE := $(LOCAL_IS_HOST_MODULE)