Merge commit 'remotes/goog/donut' into donut-release (aa53037b) · 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/definitions.mk

+8 −1

Original line number	Diff line number	Diff line
		@@ -1572,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"
		#
		@@ -1585,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/prebuilt.mk

+15 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,21 @@ $(LOCAL_BUILT_MODULE) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) \| $(ACP)
		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)

core/tasks/cts.mk

+28 −5

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ endif
		CTS_HOST_JAR := $(HOST_OUT_JAVA_LIBRARIES)/cts.jar

		junit_host_jar := $(HOST_OUT_JAVA_LIBRARIES)/junit.jar
		HOSTTESTLIB_JAR := $(HOST_OUT_JAVA_LIBRARIES)/hosttestlib.jar

		CTS_CORE_CASE_LIST := android.core.tests.annotation \
		android.core.tests.archive \
		@@ -49,6 +50,18 @@ CTS_CORE_CASE_LIST := android.core.tests.annotation \
		android.core.tests.xnet \
		android.core.tests.runner

		CTS_SECURITY_APPS_LIST := \
		CtsAppAccessData \
		CtsAppWithData \
		CtsInstrumentationAppDiffCert \
		CtsPermissionDeclareApp \
		CtsSharedUidInstall \
		CtsSharedUidInstallDiffCert \
		CtsSimpleAppInstall \
		CtsSimpleAppInstallDiffCert \
		CtsTargetInstrumentationApp \
		CtsUsePermissionDiffCert

		CTS_CASE_LIST := \
		DeviceInfoCollector \
		CtsTestStubs \
		@@ -78,13 +91,14 @@ CTS_CASE_LIST := \
		CtsPerformance5TestCases \
		ApiDemos \
		ApiDemosReferenceTest \
		$(CTS_CORE_CASE_LIST)
		$(CTS_CORE_CASE_LIST) \
		$(CTS_SECURITY_APPS_LIST)

		DEFAULT_TEST_PLAN := $(PRIVATE_DIR)/resource/plans

		$(cts_dir)/all_cts_files_stamp: PRIVATE_JUNIT_HOST_JAR := $(junit_host_jar)

		$(cts_dir)/all_cts_files_stamp: $(CTS_CASE_LIST) $(junit_host_jar) $(ACP)
		$(cts_dir)/all_cts_files_stamp: $(CTS_CASE_LIST) $(junit_host_jar) $(HOSTTESTLIB_JAR) $(ACP)
		# Make necessary directory for CTS
		@rm -rf $(PRIVATE_CTS_DIR)
		@mkdir -p $(TMP_DIR)
		@@ -97,6 +111,8 @@ $(cts_dir)/all_cts_files_stamp: $(CTS_CASE_LIST) $(junit_host_jar) $(ACP)
		$(hide) $(ACP) -fp $(CTS_EXECUTABLE_PATH) $(PRIVATE_DIR)/tools
		# Copy junit jar
		$(hide) $(ACP) -fp $(PRIVATE_JUNIT_HOST_JAR) $(PRIVATE_DIR)/tools
		# Copy hosttestlib jar
		$(hide) $(ACP) -fp $(HOSTTESTLIB_JAR) $(PRIVATE_DIR)/tools
		# Change mode of the executables
		$(hide) chmod ug+rwX $(PRIVATE_DIR)/tools/$(notdir $(CTS_EXECUTABLE_PATH))
		$(foreach apk,$(CTS_CASE_LIST), \
		@@ -218,10 +234,17 @@ $(CORE_VM_TEST_DESC): vm-tests $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar $(CORE_INT
		dot.junit.AllJunitHostTests, cts/tools/vm-tests/Android.mk)
		$(ACP) -fv $(VMTESTS_INTERMEDIATES)/android.core.vm-tests.jar $(PRIVATE_DIR)/repository/testcases/android.core.vm-tests.jar

		# Move app security host-side tests to the repository
		APP_SECURITY_LIB := $(cts_dir)/$(cts_name)/repository/testcases/CtsAppSecurityTests.jar

		$(APP_SECURITY_LIB): $(HOST_OUT_JAVA_LIBRARIES)/CtsAppSecurityTests.jar $(cts_dir)/all_cts_files_stamp $(ACP)
		$(ACP) -fv $(HOST_OUT_JAVA_LIBRARIES)/CtsAppSecurityTests.jar $(APP_SECURITY_LIB)

		# Generate the default test plan for User.
		$(DEFAULT_TEST_PLAN): $(cts_dir)/all_cts_files_stamp $(cts_dir)/all_cts_core_files_stamp $(cts_tools_src_dir)/utils/genDefaultTestPlan.sh $(CORE_VM_TEST_DESC)
		$(hide) bash $(cts_tools_src_dir)/utils/genDefaultTestPlan.sh cts/tests/tests/ \
		$(PRIVATE_DIR) $(TMP_DIR) $(TOP) $(TARGET_COMMON_OUT_ROOT) $(OUT_DIR)
		# Usage: buildCts.py <testRoot> <ctsOutputDir> <tempDir> <androidRootDir> <docletPath>
		$(DEFAULT_TEST_PLAN): $(cts_dir)/all_cts_files_stamp $(cts_dir)/all_cts_core_files_stamp $(cts_tools_src_dir)/utils/buildCts.py $(CORE_VM_TEST_DESC) $(APP_SECURITY_LIB) $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar
		$(hide) $(cts_tools_src_dir)/utils/buildCts.py cts/tests/tests/ $(PRIVATE_DIR) $(TMP_DIR) \
		$(TOP) $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar

		# Package CTS and clean up.
		#

tools/droiddoc/templates/assets/android-developer-core.css

+2 −2

Original line number	Diff line number	Diff line
		@@ -179,8 +179,8 @@ hr.blue {

		/* LAYOUT */
		#body-content {
		/* "Preliminary" watermark for preview releases and interim builds. */
		background:transparent url(images/preliminary.png) repeat scroll 0 0;
		/* "Preliminary" watermark for preview releases and interim builds.
		background:transparent url(images/preliminary.png) repeat scroll 0 0; */
		margin:0;
		position:relative;
		width:100%;