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

Commit 870ea163 authored by Yi-Yo Chiang's avatar Yi-Yo Chiang
Browse files

Build vendor_ramdisk[-debug].img if building vendor_boot.img 

Make vendor_boot.img / vendor_ramdisk.img symmetrical to boot.img /
ramdisk.img.

Bug: 201753847
Test: Build and check vendor_ramdisk[-debug].img
Change-Id: I9fb5c7fca09a77446bd140ca549c2091fc9c6a40
parent 85ed8ef8

core/Makefile

+7 −6
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)
@@ -2454,12 +2452,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.
@@ -2619,6 +2615,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

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)
@@ -1622,6 +1625,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) \
@@ -1841,6 +1845,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) \