Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 012b8e87 authored by Steve Kondik's avatar Steve Kondik
Browse files

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
parents 1d9caebe fbef8b95

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -150,6 +150,8 @@ $(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/*)



$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)



# ************************************************

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

# ************************************************

core/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -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

core/build_id.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

core/config.mk

+2 −0
Original line number Diff line number Diff line
@@ -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)

core/definitions.mk

+23 −0
Original line number Diff line number Diff line
@@ -2063,6 +2063,29 @@ $(if $(_erm_new_modules),$(eval $(1) += $(_erm_new_modules))\ 
  $(call expand-required-modules,$(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

###########################################################