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

Commit 747a0c12 authored by Yi-Yo Chiang's avatar Yi-Yo Chiang Committed by Gerrit Code Review
Browse files

Merge changes If929bcf9,I9fb5c7fc 

* changes:
  Dedup build rules of ramdisk-(debug|test-harness).img
  Build vendor_ramdisk[-debug].img if building vendor_boot.img
parents 94ce4dbe 6c51a43b

core/Makefile

+42 −68
Original line number Diff line number Diff line
@@ -1102,12 +1102,10 @@ endif 
$(INTERNAL_VENDOR_RAMDISK_TARGET): $(MKBOOTFS) $(INTERNAL_VENDOR_RAMDISK_FILES) | $(COMPRESSION_COMMAND_DEPS)

	$(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_VENDOR_RAMDISK_OUT) $(PRIVATE_ADDITIONAL_DIR) | $(COMPRESSION_COMMAND) > $@



ifeq (true,$(BOARD_BUILD_VENDOR_RAMDISK_IMAGE))

INSTALLED_VENDOR_RAMDISK_TARGET := $(PRODUCT_OUT)/vendor_ramdisk.img

$(INSTALLED_VENDOR_RAMDISK_TARGET): $(INTERNAL_VENDOR_RAMDISK_TARGET)

	$(call pretty,"Target vendor ramdisk: $@")

	@echo "Target vendor ramdisk: $@"

	$(copy-file-to-target)

endif



INSTALLED_FILES_FILE_VENDOR_RAMDISK := $(PRODUCT_OUT)/installed-files-vendor-ramdisk.txt

INSTALLED_FILES_JSON_VENDOR_RAMDISK := $(INSTALLED_FILES_FILE_VENDOR_RAMDISK:.txt=.json)
@@ -2287,70 +2285,59 @@ $(error MTD device is no longer supported and thus BOARD_NAND_SPARE_SIZE is depr 
endif





# -----------------------------------------------------------------

# Build debug ramdisk and debug boot image.

ifneq ($(BUILDING_DEBUG_BOOT_IMAGE)$(BUILDING_DEBUG_VENDOR_BOOT_IMAGE),)



# ramdisk-debug.img will merge the content from either ramdisk.img or

# ramdisk-recovery.img, depending on whether BOARD_USES_RECOVERY_AS_BOOT

# is set or not.

# INTERNAL_DEBUG_RAMDISK_ADDITIONAL_DEP would ensure INTERNAL_DEBUG_RAMDISK_ADDITIONAL_DIR is created.

ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

  INTERNAL_DEBUG_RAMDISK_ADDITIONAL_DIR := $(TARGET_RECOVERY_ROOT_OUT)

  INTERNAL_DEBUG_RAMDISK_ADDITIONAL_DEP := $(recovery_ramdisk)

else  # BOARD_USES_RECOVERY_AS_BOOT == true

  INTERNAL_DEBUG_RAMDISK_ADDITIONAL_DIR := $(TARGET_RAMDISK_OUT)

  INTERNAL_DEBUG_RAMDISK_ADDITIONAL_DEP := $(INSTALLED_RAMDISK_TARGET)

endif # BOARD_USES_RECOVERY_AS_BOOT != true



# -----------------------------------------------------------------

# the debug ramdisk, which is the original ramdisk plus additional

# files: force_debuggable, adb_debug.prop and userdebug sepolicy.

# When /force_debuggable is present, /init will load userdebug sepolicy

# and property files to allow adb root, if the device is unlocked.

ifneq ($(BUILDING_DEBUG_BOOT_IMAGE)$(BUILDING_DEBUG_VENDOR_BOOT_IMAGE),)



BUILT_DEBUG_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk-debug.img

INSTALLED_DEBUG_RAMDISK_TARGET := $(BUILT_DEBUG_RAMDISK_TARGET)

INSTALLED_DEBUG_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk-debug.img



INTERNAL_DEBUG_RAMDISK_FILES := $(filter $(TARGET_DEBUG_RAMDISK_OUT)/%, \

    $(ALL_GENERATED_SOURCES) \

    $(ALL_DEFAULT_INSTALLED_MODULES))



# INSTALLED_FILES_FILE_DEBUG_RAMDISK would ensure TARGET_DEBUG_RAMDISK_OUT is created.

INSTALLED_FILES_FILE_DEBUG_RAMDISK := $(PRODUCT_OUT)/installed-files-ramdisk-debug.txt

INSTALLED_FILES_JSON_DEBUG_RAMDISK := $(INSTALLED_FILES_FILE_DEBUG_RAMDISK:.txt=.json)

$(INSTALLED_FILES_FILE_DEBUG_RAMDISK): .KATI_IMPLICIT_OUTPUTS := $(INSTALLED_FILES_JSON_DEBUG_RAMDISK)



# ramdisk-debug.img will merge the content from either ramdisk.img or

# ramdisk-recovery.img, depending on whether BOARD_USES_RECOVERY_AS_BOOT

# is set or not.

ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

  $(INSTALLED_FILES_FILE_DEBUG_RAMDISK): PRIVATE_ADDITIONAL_DIR := $(TARGET_RECOVERY_ROOT_OUT)

  $(INSTALLED_FILES_FILE_DEBUG_RAMDISK): $(recovery_ramdisk)

else

  $(INSTALLED_FILES_FILE_DEBUG_RAMDISK): PRIVATE_ADDITIONAL_DIR := $(TARGET_RAMDISK_OUT)

  $(INSTALLED_FILES_FILE_DEBUG_RAMDISK): $(INSTALLED_RAMDISK_TARGET)

endif # BOARD_USES_RECOVERY_AS_BOOT



$(INSTALLED_FILES_FILE_DEBUG_RAMDISK): $(INTERNAL_DEBUG_RAMDISK_ADDITIONAL_DEP)

$(INSTALLED_FILES_FILE_DEBUG_RAMDISK) : $(INTERNAL_DEBUG_RAMDISK_FILES) $(FILESLIST) $(FILESLIST_UTIL)

	@echo Installed file list: $@

	mkdir -p $(dir $@)

	rm -f $@

	$(FILESLIST) $(TARGET_DEBUG_RAMDISK_OUT) $(PRIVATE_ADDITIONAL_DIR) > $(@:.txt=.json)

	$(FILESLIST) $(TARGET_DEBUG_RAMDISK_OUT) $(INTERNAL_DEBUG_RAMDISK_ADDITIONAL_DIR) > $(@:.txt=.json)

	$(FILESLIST_UTIL) -c $(@:.txt=.json) > $@



ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

  $(INSTALLED_DEBUG_RAMDISK_TARGET): PRIVATE_ADDITIONAL_DIR := $(TARGET_RECOVERY_ROOT_OUT)

  $(INSTALLED_DEBUG_RAMDISK_TARGET): $(recovery_ramdisk)

else

  $(INSTALLED_DEBUG_RAMDISK_TARGET): PRIVATE_ADDITIONAL_DIR := $(TARGET_RAMDISK_OUT)

  $(INSTALLED_DEBUG_RAMDISK_TARGET): $(INSTALLED_RAMDISK_TARGET)

endif # BOARD_USES_RECOVERY_AS_BOOT



$(INSTALLED_DEBUG_RAMDISK_TARGET): $(INSTALLED_FILES_FILE_DEBUG_RAMDISK)

$(INSTALLED_DEBUG_RAMDISK_TARGET): $(INTERNAL_DEBUG_RAMDISK_ADDITIONAL_DEP)

$(INSTALLED_DEBUG_RAMDISK_TARGET): $(MKBOOTFS) $(INTERNAL_DEBUG_RAMDISK_FILES) | $(COMPRESSION_COMMAND_DEPS)

	$(call pretty,"Target debug ramdisk: $@")

	mkdir -p $(TARGET_DEBUG_RAMDISK_OUT)

	touch $(TARGET_DEBUG_RAMDISK_OUT)/force_debuggable

	$(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_DEBUG_RAMDISK_OUT) $(PRIVATE_ADDITIONAL_DIR) | $(COMPRESSION_COMMAND) > $@

	$(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_DEBUG_RAMDISK_OUT) $(INTERNAL_DEBUG_RAMDISK_ADDITIONAL_DIR) | $(COMPRESSION_COMMAND) > $@



.PHONY: ramdisk_debug-nodeps

ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

  ramdisk_debug-nodeps: PRIVATE_ADDITIONAL_DIR := $(TARGET_RECOVERY_ROOT_OUT)

else

  ramdisk_debug-nodeps: PRIVATE_ADDITIONAL_DIR := $(TARGET_RAMDISK_OUT)

endif # BOARD_USES_RECOVERY_AS_BOOT

ramdisk_debug-nodeps: $(MKBOOTFS) | $(COMPRESSION_COMMAND_DEPS)

	echo "make $@: ignoring dependencies"

	mkdir -p $(TARGET_DEBUG_RAMDISK_OUT)

	mkdir -p $(TARGET_DEBUG_RAMDISK_OUT) $(INTERNAL_DEBUG_RAMDISK_ADDITIONAL_DIR)

	touch $(TARGET_DEBUG_RAMDISK_OUT)/force_debuggable

	$(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_DEBUG_RAMDISK_OUT) $(PRIVATE_ADDITIONAL_DIR) | $(COMPRESSION_COMMAND) > $(INSTALLED_DEBUG_RAMDISK_TARGET)



endif # BUILDING_DEBUG_BOOT_IMAGE || BUILDING_DEBUG_VENDOR_BOOT_IMAGE

	$(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_DEBUG_RAMDISK_OUT) $(INTERNAL_DEBUG_RAMDISK_ADDITIONAL_DIR) | $(COMPRESSION_COMMAND) > $(INSTALLED_DEBUG_RAMDISK_TARGET)



# -----------------------------------------------------------------

# the boot-debug.img, which is the kernel plus ramdisk-debug.img
@@ -2367,10 +2354,11 @@ else 
endif



# Replace ramdisk.img in $(MKBOOTIMG) ARGS with ramdisk-debug.img to build boot-debug.img

$(INSTALLED_DEBUG_BOOTIMAGE_TARGET): $(INSTALLED_DEBUG_RAMDISK_TARGET)

ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

  INTERNAL_DEBUG_BOOTIMAGE_ARGS := $(subst $(recovery_ramdisk),$(INSTALLED_DEBUG_RAMDISK_TARGET), $(INTERNAL_RECOVERYIMAGE_ARGS))

  INTERNAL_DEBUG_BOOTIMAGE_ARGS := $(subst $(INTERNAL_DEBUG_RAMDISK_ADDITIONAL_DEP),$(INSTALLED_DEBUG_RAMDISK_TARGET),$(INTERNAL_RECOVERYIMAGE_ARGS))

else

  INTERNAL_DEBUG_BOOTIMAGE_ARGS := $(subst $(INSTALLED_RAMDISK_TARGET),$(INSTALLED_DEBUG_RAMDISK_TARGET), $(INTERNAL_BOOTIMAGE_ARGS))

  INTERNAL_DEBUG_BOOTIMAGE_ARGS := $(subst $(INTERNAL_DEBUG_RAMDISK_ADDITIONAL_DEP),$(INSTALLED_DEBUG_RAMDISK_TARGET),$(INTERNAL_BOOTIMAGE_ARGS))

endif



# If boot.img is chained but boot-debug.img is not signed, libavb in bootloader
@@ -2404,7 +2392,7 @@ define build-debug-bootimage-target 
endef



# Depends on original boot.img and ramdisk-debug.img, to build the new boot-debug.img

$(INSTALLED_DEBUG_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INSTALLED_BOOTIMAGE_TARGET) $(INSTALLED_DEBUG_RAMDISK_TARGET) $(BOARD_GKI_SIGNING_KEY_PATH) $(AVBTOOL)

$(INSTALLED_DEBUG_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INSTALLED_BOOTIMAGE_TARGET) $(BOARD_GKI_SIGNING_KEY_PATH) $(AVBTOOL)

	$(call pretty,"Target boot debug image: $@")

	$(call build-debug-bootimage-target, $@)
@@ -2454,12 +2442,10 @@ $(INTERNAL_VENDOR_DEBUG_RAMDISK_TARGET): $(MKBOOTFS) $(INTERNAL_VENDOR_DEBUG_RAM 
	mkdir -p $(TARGET_VENDOR_DEBUG_RAMDISK_OUT)

	$(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_VENDOR_RAMDISK_OUT) $(TARGET_DEBUG_RAMDISK_OUT) $(TARGET_VENDOR_DEBUG_RAMDISK_OUT) $(PRIVATE_ADDITIONAL_DIR) | $(COMPRESSION_COMMAND) > $@



ifeq (true,$(BOARD_BUILD_VENDOR_RAMDISK_IMAGE))

INSTALLED_VENDOR_DEBUG_RAMDISK_TARGET := $(PRODUCT_OUT)/vendor_ramdisk-debug.img

$(INSTALLED_VENDOR_DEBUG_RAMDISK_TARGET): $(INTERNAL_VENDOR_DEBUG_RAMDISK_TARGET)

	$(call pretty,"Target vendor debug ramdisk: $@")

	@echo "Target debug vendor ramdisk: $@"

	$(copy-file-to-target)

endif



# -----------------------------------------------------------------

# vendor_boot-debug.img.
@@ -2496,10 +2482,7 @@ endif # BUILDING_DEBUG_VENDOR_BOOT_IMAGE 
# -----------------------------------------------------------------

# The test harness ramdisk, which is based off debug_ramdisk, plus a

# few additional test-harness-specific properties in adb_debug.prop.

ifneq ($(BUILDING_DEBUG_BOOT_IMAGE)$(BUILDING_DEBUG_VENDOR_BOOT_IMAGE),)



BUILT_TEST_HARNESS_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk-test-harness.img

INSTALLED_TEST_HARNESS_RAMDISK_TARGET := $(BUILT_TEST_HARNESS_RAMDISK_TARGET)

INSTALLED_TEST_HARNESS_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk-test-harness.img



# Appends a few test harness specific properties into the adb_debug.prop.

TEST_HARNESS_PROP_TARGET := $(TARGET_TEST_HARNESS_RAMDISK_OUT)/adb_debug.prop
@@ -2519,38 +2502,22 @@ INTERNAL_TEST_HARNESS_RAMDISK_FILES := $(filter $(TARGET_TEST_HARNESS_RAMDISK_OU 
    $(ALL_GENERATED_SOURCES) \

    $(ALL_DEFAULT_INSTALLED_MODULES))



# ramdisk-test-harness.img will merge the content from either ramdisk.img or

# ramdisk-recovery.img, depending on whether BOARD_USES_RECOVERY_AS_BOOT is set

# or not.

ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

  $(INSTALLED_TEST_HARNESS_RAMDISK_TARGET): PRIVATE_ADDITIONAL_DIR := $(TARGET_RECOVERY_ROOT_OUT)

  $(INSTALLED_TEST_HARNESS_RAMDISK_TARGET): $(recovery_ramdisk)

else

  $(INSTALLED_TEST_HARNESS_RAMDISK_TARGET): PRIVATE_ADDITIONAL_DIR := $(TARGET_RAMDISK_OUT)

  $(INSTALLED_TEST_HARNESS_RAMDISK_TARGET): $(INSTALLED_RAMDISK_TARGET)

endif # BOARD_USES_RECOVERY_AS_BOOT



# The test harness ramdisk will rsync the files from the debug ramdisk, then appends some props.

$(INSTALLED_TEST_HARNESS_RAMDISK_TARGET): $(INSTALLED_DEBUG_RAMDISK_TARGET)

$(INSTALLED_TEST_HARNESS_RAMDISK_TARGET): $(INTERNAL_DEBUG_RAMDISK_ADDITIONAL_DEP)

$(INSTALLED_TEST_HARNESS_RAMDISK_TARGET): $(MKBOOTFS) $(INTERNAL_TEST_HARNESS_RAMDISK_FILES) | $(COMPRESSION_COMMAND_DEPS)

	$(call pretty,"Target test harness ramdisk: $@")

	rsync --chmod=u+w -a $(TARGET_DEBUG_RAMDISK_OUT)/ $(TARGET_TEST_HARNESS_RAMDISK_OUT)

	$(call append-test-harness-props,$(ADDITIONAL_TEST_HARNESS_PROPERTIES),$(TEST_HARNESS_PROP_TARGET))

	$(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_TEST_HARNESS_RAMDISK_OUT) $(PRIVATE_ADDITIONAL_DIR) | $(COMPRESSION_COMMAND) > $@

	$(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_TEST_HARNESS_RAMDISK_OUT) $(INTERNAL_DEBUG_RAMDISK_ADDITIONAL_DIR) | $(COMPRESSION_COMMAND) > $@



.PHONY: ramdisk_test_harness-nodeps

ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

  ramdisk_test_harness-nodeps: PRIVATE_ADDITIONAL_DIR := $(TARGET_RECOVERY_ROOT_OUT)

else

  ramdisk_test_harness-nodeps: PRIVATE_ADDITIONAL_DIR := $(TARGET_RAMDISK_OUT)

endif # BOARD_USES_RECOVERY_AS_BOOT

ramdisk_test_harness-nodeps: $(MKBOOTFS) | $(COMPRESSION_COMMAND_DEPS)

	echo "make $@: ignoring dependencies"

	rsync --chmod=u+w -a $(TARGET_DEBUG_RAMDISK_OUT)/ $(TARGET_TEST_HARNESS_RAMDISK_OUT)

	$(call append-test-harness-props,$(ADDITIONAL_TEST_HARNESS_PROPERTIES),$(TEST_HARNESS_PROP_TARGET))

	$(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_TEST_HARNESS_RAMDISK_OUT) $(PRIVATE_ADDITIONAL_DIR) | $(COMPRESSION_COMMAND) > $(INSTALLED_TEST_HARNESS_RAMDISK_TARGET)



endif # BUILDING_DEBUG_BOOT_IMAGE || BUILDING_DEBUG_VENDOR_BOOT_IMAGE

	mkdir -p $(INTERNAL_DEBUG_RAMDISK_ADDITIONAL_DIR)

	$(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_TEST_HARNESS_RAMDISK_OUT) $(INTERNAL_DEBUG_RAMDISK_ADDITIONAL_DIR) | $(COMPRESSION_COMMAND) > $(INSTALLED_TEST_HARNESS_RAMDISK_TARGET)



# -----------------------------------------------------------------

# the boot-test-harness.img, which is the kernel plus ramdisk-test-harness.img
@@ -2619,6 +2586,11 @@ $(INTERNAL_VENDOR_TEST_HARNESS_RAMDISK_TARGET): $(INTERNAL_VENDOR_RAMDISK_TARGET 
$(INTERNAL_VENDOR_TEST_HARNESS_RAMDISK_TARGET): $(MKBOOTFS) | $(COMPRESSION_COMMAND_DEPS)

	$(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_VENDOR_RAMDISK_OUT) $(TARGET_TEST_HARNESS_RAMDISK_OUT) $(PRIVATE_ADDITIONAL_DIR) | $(COMPRESSION_COMMAND) > $@



INSTALLED_VENDOR_TEST_HARNESS_RAMDISK_TARGET := $(PRODUCT_OUT)/vendor_ramdisk-test-harness.img

$(INSTALLED_VENDOR_TEST_HARNESS_RAMDISK_TARGET): $(INTERNAL_VENDOR_TEST_HARNESS_RAMDISK_TARGET)

	@echo "Target test harness vendor ramdisk: $@"

	$(copy-file-to-target)



# -----------------------------------------------------------------

# vendor_boot-test-harness.img.

INSTALLED_VENDOR_TEST_HARNESS_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/vendor_boot-test-harness.img
@@ -2638,6 +2610,8 @@ $(INSTALLED_VENDOR_TEST_HARNESS_BOOTIMAGE_TARGET): $(INTERNAL_VENDOR_RAMDISK_FRA 


endif # BUILDING_DEBUG_VENDOR_BOOT_IMAGE



endif # BUILDING_DEBUG_BOOT_IMAGE || BUILDING_DEBUG_VENDOR_BOOT_IMAGE





# Creates a compatibility symlink between two partitions, e.g. /system/vendor to /vendor

# $1: from location (e.g $(TARGET_OUT)/vendor)

core/main.mk

+5 −0
Original line number Diff line number Diff line
@@ -1563,6 +1563,9 @@ vendorramdisk: $(INSTALLED_VENDOR_RAMDISK_TARGET) 
.PHONY: vendorramdisk_debug

vendorramdisk_debug: $(INSTALLED_VENDOR_DEBUG_RAMDISK_TARGET)



.PHONY: vendorramdisk_test_harness

vendorramdisk_test_harness: $(INSTALLED_VENDOR_TEST_HARNESS_RAMDISK_TARGET)



.PHONY: productimage

productimage: $(INSTALLED_PRODUCTIMAGE_TARGET)
@@ -1626,6 +1629,7 @@ droidcore-unbundled: $(filter $(HOST_OUT_ROOT)/%,$(modules_to_install)) \ 
    $(INSTALLED_VENDORIMAGE_TARGET) \

    $(INSTALLED_VENDOR_BOOTIMAGE_TARGET) \

    $(INSTALLED_VENDOR_DEBUG_BOOTIMAGE_TARGET) \

    $(INSTALLED_VENDOR_TEST_HARNESS_RAMDISK_TARGET) \

    $(INSTALLED_VENDOR_TEST_HARNESS_BOOTIMAGE_TARGET) \

    $(INSTALLED_VENDOR_RAMDISK_TARGET) \

    $(INSTALLED_VENDOR_DEBUG_RAMDISK_TARGET) \
@@ -1845,6 +1849,7 @@ else ifeq ($(TARGET_BUILD_UNBUNDLED),$(TARGET_BUILD_UNBUNDLED_IMAGE)) 
      $(INSTALLED_TEST_HARNESS_RAMDISK_TARGET) \

      $(INSTALLED_TEST_HARNESS_BOOTIMAGE_TARGET) \

      $(INSTALLED_VENDOR_DEBUG_BOOTIMAGE_TARGET) \

      $(INSTALLED_VENDOR_TEST_HARNESS_RAMDISK_TARGET) \

      $(INSTALLED_VENDOR_TEST_HARNESS_BOOTIMAGE_TARGET) \

      $(INSTALLED_VENDOR_RAMDISK_TARGET) \

      $(INSTALLED_VENDOR_DEBUG_RAMDISK_TARGET) \