diff options
author | Steve Kondik <shade@chemlab.org> | 2013-02-12 23:08:55 -0800 |
---|---|---|
committer | Steve Kondik <shade@chemlab.org> | 2013-02-12 23:08:55 -0800 |
commit | 012b8e877044b0e04d7ec3dfa1226fc16a953909 (patch) | |
tree | 3c201d1bca19eeb3cb34af7fed4405b2dff8083c /core | |
parent | 1d9caebe5ca61453ecb4b1b0f3be79d271ffa40c (diff) | |
parent | fbef8b9578aaa422d5bd3153eb50df739815672c (diff) | |
download | build-012b8e877044b0e04d7ec3dfa1226fc16a953909.zip build-012b8e877044b0e04d7ec3dfa1226fc16a953909.tar.gz build-012b8e877044b0e04d7ec3dfa1226fc16a953909.tar.bz2 |
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/build into 1.1
Android 4.2.2 release 1
Conflicts:
core/build_id.mk
core/tasks/apicheck.mk
target/product/full_base.mk
Change-Id: I085357b5573fec85b05d3fc0a86c053a647e2572
Diffstat (limited to 'core')
-rw-r--r-- | core/Makefile | 6 | ||||
-rw-r--r-- | core/build_id.mk | 2 | ||||
-rw-r--r-- | core/config.mk | 2 | ||||
-rw-r--r-- | core/definitions.mk | 23 | ||||
-rw-r--r-- | core/droiddoc.mk | 6 | ||||
-rw-r--r-- | core/tasks/apicheck.mk | 60 | ||||
-rw-r--r-- | core/version_defaults.mk | 2 |
7 files changed, 62 insertions, 39 deletions
diff --git a/core/Makefile b/core/Makefile index 98cd055..5544895 100644 --- a/core/Makefile +++ b/core/Makefile @@ -584,7 +584,7 @@ ifneq (true,$(TARGET_USERIMAGES_SPARSE_EXT_DISABLED)) endif ifeq ($(INTERNAL_USERIMAGES_USE_EXT),true) -INTERNAL_USERIMAGES_DEPS := $(MKEXTUSERIMG) $(MAKE_EXT4FS) +INTERNAL_USERIMAGES_DEPS := $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(SIMG2IMG) $(E2FSCK) else INTERNAL_USERIMAGES_DEPS := $(MKYAFFS2) endif @@ -1105,7 +1105,9 @@ DISTTOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \ $(HOST_OUT_JAVA_LIBRARIES)/dumpkey.jar \ $(HOST_OUT_JAVA_LIBRARIES)/signapk.jar \ $(HOST_OUT_EXECUTABLES)/mkuserimg.sh \ - $(HOST_OUT_EXECUTABLES)/make_ext4fs + $(HOST_OUT_EXECUTABLES)/make_ext4fs \ + $(HOST_OUT_EXECUTABLES)/simg2img \ + $(HOST_OUT_EXECUTABLES)/e2fsck OTATOOLS := $(DISTTOOLS) \ $(HOST_OUT_EXECUTABLES)/aapt diff --git a/core/build_id.mk b/core/build_id.mk index 6d56e51..9eeb4bb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOP40G +export BUILD_ID=JDQ39 diff --git a/core/config.mk b/core/config.mk index 51920f4..ab06f6a 100644 --- a/core/config.mk +++ b/core/config.mk @@ -297,6 +297,8 @@ MKEXT2IMG := $(HOST_OUT_EXECUTABLES)/genext2fs$(HOST_EXECUTABLE_SUFFIX) MAKE_EXT4FS := $(HOST_OUT_EXECUTABLES)/make_ext4fs$(HOST_EXECUTABLE_SUFFIX) MKEXTUSERIMG := $(HOST_OUT_EXECUTABLES)/mkuserimg.sh MKEXT2BOOTIMG := external/genext2fs/mkbootimg_ext2.sh +SIMG2IMG := $(HOST_OUT_EXECUTABLES)/simg2img$(HOST_EXECUTABLE_SUFFIX) +E2FSCK := $(HOST_OUT_EXECUTABLES)/e2fsck$(HOST_EXECUTABLE_SUFFIX) MKTARBALL := build/tools/mktarball.sh TUNE2FS := $(HOST_OUT_EXECUTABLES)/tune2fs$(HOST_EXECUTABLE_SUFFIX) E2FSCK := $(HOST_OUT_EXECUTABLES)/e2fsck$(HOST_EXECUTABLE_SUFFIX) diff --git a/core/definitions.mk b/core/definitions.mk index a02f55f..a2d22c7 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -2064,6 +2064,29 @@ $(if $(_erm_new_modules),$(eval $(1) += $(_erm_new_modules))\ endef ########################################################### +## API Check +########################################################### + +# eval this to define a rule that runs apicheck. +# +# Args: +# $(1) target +# $(2) stable api file +# $(3) api file to be tested +# $(4) arguments for apicheck +# $(5) command to run if apicheck failed +# $(6) target dependent on this api check +# $(7) additional dependencies +define check-api +$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(strip $(1))-timestamp: $(2) $(3) $(APICHECK) $(7) + @echo "Checking API:" $(1) + $(hide) ( $(APICHECK_COMMAND) $(4) $(2) $(3) || ( $(5) ; exit 38 ) ) + $(hide) mkdir -p $$(dir $$@) + $(hide) touch $$@ +$(6): $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(strip $(1))-timestamp +endef + +########################################################### ## Other includes ########################################################### diff --git a/core/droiddoc.mk b/core/droiddoc.mk index 639f219..211a002 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -147,6 +147,11 @@ $(full_target): PRIVATE_DROIDDOC_HTML_DIR := -htmldir $(LOCAL_PATH)/$(LOCAL_DROI else $(full_target): PRIVATE_DROIDDOC_HTML_DIR := endif +ifneq ($(strip $(LOCAL_ADDITIONAL_HTML_DIR)),) +$(full_target): PRIVATE_ADDITIONAL_HTML_DIR := -htmldir2 $(LOCAL_PATH)/$(LOCAL_ADDITIONAL_HTML_DIR) +else +$(full_target): PRIVATE_ADDITIONAL_HTML_DIR := +endif # TODO: not clear if this is used any more $(full_target): PRIVATE_LOCAL_PATH := $(LOCAL_PATH) @@ -171,6 +176,7 @@ $(full_target): $(full_src_files) $(droiddoc_templates) $(droiddoc) $(html_dir_f -docletpath $(PRIVATE_DOCLETPATH) \ -templatedir $(PRIVATE_CUSTOM_TEMPLATE_DIR) \ $(PRIVATE_DROIDDOC_HTML_DIR) \ + $(PRIVATE_ADDITIONAL_HTML_DIR) \ $(addprefix -bootclasspath ,$(PRIVATE_BOOTCLASSPATH)) \ $(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \ -sourcepath $(PRIVATE_SOURCE_PATH)$(addprefix :,$(PRIVATE_CLASSPATH)) \ diff --git a/core/tasks/apicheck.mk b/core/tasks/apicheck.mk index c6d2ab1..753b5bc 100644 --- a/core/tasks/apicheck.mk +++ b/core/tasks/apicheck.mk @@ -22,58 +22,48 @@ ifeq (,$(filter true, $(BUILD_TINY_ANDROID) $(TARGET_BUILD_PDK))) .PHONY: checkapi -# eval this to define a rule that runs apicheck. -# -# Args: -# $(1) target -# $(2) stable api file -# $(3) api file to be tested -# $(4) arguments for apicheck -# $(5) command to run if apicheck failed -define check-api -$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(strip $(1))-timestamp: $(2) $(3) $(APICHECK) - @echo -e ${CL_YLW}"Checking API:"${CL_RST} $(1) - $(hide) ( $(APICHECK_COMMAND) $(4) $(2) $(3) || ( $(5) ; exit 38 ) ) - $(hide) mkdir -p $$(dir $$@) - $(hide) touch $$@ -checkapi: $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(strip $(1))-timestamp -endef - # Run the checkapi rules by default. droidcore: checkapi last_released_sdk_version := $(lastword $(call numerically_sort, \ - $(filter-out $(SRC_API_DIR)/current, \ + $(filter-out current, \ $(patsubst $(SRC_API_DIR)/%.txt,%, $(wildcard $(SRC_API_DIR)/*.txt)) \ )\ )) # INTERNAL_PLATFORM_API_FILE is the one build by droiddoc. +# Note that since INTERNAL_PLATFORM_API_FILE is the byproduct of api-stubs module, +# (See frameworks/base/Android.mk) +# we need to add api-stubs as additional dependency of the api check. # Check that the API we're building hasn't broken the last-released # SDK version. $(eval $(call check-api, \ - checkapi-last, \ - $(SRC_API_DIR)/$(last_released_sdk_version).txt, \ - $(INTERNAL_PLATFORM_API_FILE), \ - -hide 2 -hide 3 -hide 4 -hide 5 -hide 6 -hide 24 -hide 25 \ - -error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 \ - -error 16 -error 17 -error 18 , \ - cat $(BUILD_SYSTEM)/apicheck_msg_last.txt \ - )) + checkapi-last, \ + $(SRC_API_DIR)/$(last_released_sdk_version).txt, \ + $(INTERNAL_PLATFORM_API_FILE), \ + -hide 2 -hide 3 -hide 4 -hide 5 -hide 6 -hide 24 -hide 25 \ + -error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 \ + -error 16 -error 17 -error 18 , \ + cat $(BUILD_SYSTEM)/apicheck_msg_last.txt, \ + checkapi, \ + $(call doc-timestamp-for,api-stubs) \ + )) # Check that the API we're building hasn't changed from the not-yet-released # SDK version. $(eval $(call check-api, \ - checkapi-current, \ - $(SRC_API_DIR)/current.txt, \ - $(INTERNAL_PLATFORM_API_FILE), \ - -error 2 -error 3 -error 4 -error 5 -error 6 \ - -error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 \ - -error 16 -error 17 -error 18 -error 19 -error 20 -error 21 -error 23 -error 24 \ - -error 25 , \ - cat $(BUILD_SYSTEM)/apicheck_msg_current.txt \ - )) + checkapi-current, \ + $(SRC_API_DIR)/current.txt, \ + $(INTERNAL_PLATFORM_API_FILE), \ + -error 2 -error 3 -error 4 -error 5 -error 6 \ + -error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 \ + -error 16 -error 17 -error 18 -error 19 -error 20 -error 21 -error 23 -error 24 \ + -error 25 , \ + cat $(BUILD_SYSTEM)/apicheck_msg_current.txt, \ + checkapi, \ + $(call doc-timestamp-for,api-stubs) \ + )) .PHONY: update-api update-api: $(INTERNAL_PLATFORM_API_FILE) | $(ACP) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index fb1f361..e3ba14f 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -41,7 +41,7 @@ ifeq "" "$(PLATFORM_VERSION)" # which is the version that we reveal to the end user. # Update this value when the platform version changes (rather # than overriding it somewhere else). Can be an arbitrary string. - PLATFORM_VERSION := 4.2.1 + PLATFORM_VERSION := 4.2.2 endif ifeq "" "$(PLATFORM_SDK_VERSION)" |