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

Commit a3ee330a authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am fa67740a: am 25977365: Merge "mkbootimg: Support custom mkbootimg implementation" 

* commit 'fa67740a':
  mkbootimg: Support custom mkbootimg implementation
parents 03fb7473 fa67740a

core/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -1291,7 +1291,8 @@ $(INTERNAL_OTA_PACKAGE_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR) 


$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS)

	@echo "Package OTA: $@"

	$(hide) ./build/tools/releasetools/ota_from_target_files -v \

	$(hide) MKBOOTIMG=$(BOARD_CUSTOM_MKBOOTIMG) \

	   ./build/tools/releasetools/ota_from_target_files -v \

	   -p $(HOST_OUT) \

	   -k $(KEY_CERT_PAIR) \

	   $(BUILT_TARGET_FILES_PACKAGE) $@
@@ -1319,7 +1320,8 @@ endif 


$(INTERNAL_UPDATE_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS)

	@echo "Package: $@"

	$(hide) ./build/tools/releasetools/img_from_target_files -v \

	$(hide) MKBOOTIMG=$(BOARD_CUSTOM_MKBOOTIMG) \

	   ./build/tools/releasetools/img_from_target_files -v \

	   -s $(extensions) \

	   -p $(HOST_OUT) \

	   $(BUILT_TARGET_FILES_PACKAGE) $@

core/config.mk

+4 −0
Original line number Diff line number Diff line
@@ -311,7 +311,11 @@ PROTOC := $(HOST_OUT_EXECUTABLES)/aprotoc$(HOST_EXECUTABLE_SUFFIX) 
SIGNAPK_JAR := $(HOST_OUT_JAVA_LIBRARIES)/signapk$(COMMON_JAVA_PACKAGE_SUFFIX)

MKBOOTFS := $(HOST_OUT_EXECUTABLES)/mkbootfs$(HOST_EXECUTABLE_SUFFIX)

MINIGZIP := $(HOST_OUT_EXECUTABLES)/minigzip$(HOST_EXECUTABLE_SUFFIX)

ifeq (,$(strip $(BOARD_CUSTOM_MKBOOTIMG)))

MKBOOTIMG := $(HOST_OUT_EXECUTABLES)/mkbootimg$(HOST_EXECUTABLE_SUFFIX)

else

MKBOOTIMG := $(BOARD_CUSTOM_MKBOOTIMG)

endif

MKYAFFS2 := $(HOST_OUT_EXECUTABLES)/mkyaffs2image$(HOST_EXECUTABLE_SUFFIX)

APICHECK := $(HOST_OUT_EXECUTABLES)/apicheck$(HOST_EXECUTABLE_SUFFIX)

FS_GET_STATS := $(HOST_OUT_EXECUTABLES)/fs_get_stats$(HOST_EXECUTABLE_SUFFIX)

tools/releasetools/common.py

+4 −1
Original line number Diff line number Diff line
@@ -287,7 +287,10 @@ def BuildBootableImage(sourcedir, fs_config_file, info_dict=None): 
  assert p1.returncode == 0, "mkbootfs of %s ramdisk failed" % (targetname,)

  assert p2.returncode == 0, "minigzip of %s ramdisk failed" % (targetname,)



  cmd = ["mkbootimg", "--kernel", os.path.join(sourcedir, "kernel")]

  # use MKBOOTIMG from environ, or "mkbootimg" if empty or not set

  mkbootimg = os.getenv('MKBOOTIMG') or "mkbootimg"



  cmd = [mkbootimg, "--kernel", os.path.join(sourcedir, "kernel")]



  fn = os.path.join(sourcedir, "cmdline")

  if os.access(fn, os.F_OK):