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

Commit d589c507 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add installed-files-vendor-ramdisk.txt" am: 1393da03 am: a0ceb3c1 

Original change: https://android-review.googlesource.com/c/platform/build/+/1507726

Change-Id: I188a3eb0b8da3cc92e5d01abf391fb7a724ad1f8
parents 31e20aa2 a0ceb3c1

core/Makefile

+11 −0
Original line number Diff line number Diff line
@@ -934,6 +934,17 @@ 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) > $@



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

INSTALLED_FILES_JSON_VENDOR_RAMDISK := $(INSTALLED_FILES_FILE_VENDOR_RAMDISK:.txt=.json)

$(INSTALLED_FILES_FILE_VENDOR_RAMDISK): .KATI_IMPLICIT_OUTPUTS := $(INSTALLED_FILES_JSON_VENDOR_RAMDISK)

$(INSTALLED_FILES_FILE_VENDOR_RAMDISK): $(INTERNAL_VENDOR_RAMDISK_TARGET)

$(INSTALLED_FILES_FILE_VENDOR_RAMDISK): $(INTERNAL_VENDOR_RAMDISK_FILES) $(FILESLIST) $(FILESLIST_UTIL)

	echo Installed file list: $@

	mkdir -p $(dir $@)

	rm -f $@

	$(hide) $(FILESLIST) $(TARGET_VENDOR_RAMDISK_OUT) > $(@:.txt=.json)

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



ifdef BOARD_INCLUDE_DTB_IN_BOOTIMG

  INTERNAL_VENDOR_BOOTIMAGE_ARGS += --dtb $(INSTALLED_DTBIMAGE_TARGET)

endif

core/main.mk

+4 −0
Original line number Diff line number Diff line
@@ -1625,6 +1625,8 @@ droidcore: $(filter $(HOST_OUT_ROOT)/%,$(modules_to_install)) \ 
    $(INSTALLED_FILES_JSON_RAMDISK) \

    $(INSTALLED_FILES_FILE_DEBUG_RAMDISK) \

    $(INSTALLED_FILES_JSON_DEBUG_RAMDISK) \

    $(INSTALLED_FILES_FILE_VENDOR_RAMDISK) \

    $(INSTALLED_FILES_JSON_VENDOR_RAMDISK) \

    $(INSTALLED_FILES_FILE_VENDOR_DEBUG_RAMDISK) \

    $(INSTALLED_FILES_JSON_VENDOR_DEBUG_RAMDISK) \

    $(INSTALLED_FILES_FILE_ROOT) \
@@ -1774,6 +1776,8 @@ else ifeq (,$(TARGET_BUILD_UNBUNDLED)) 
      $(INSTALLED_FILES_JSON_RAMDISK) \

      $(INSTALLED_FILES_FILE_DEBUG_RAMDISK) \

      $(INSTALLED_FILES_JSON_DEBUG_RAMDISK) \

      $(INSTALLED_FILES_FILE_VENDOR_RAMDISK) \

      $(INSTALLED_FILES_JSON_VENDOR_RAMDISK) \

      $(INSTALLED_FILES_FILE_VENDOR_DEBUG_RAMDISK) \

      $(INSTALLED_FILES_JSON_VENDOR_DEBUG_RAMDISK) \

      $(INSTALLED_DEBUG_RAMDISK_TARGET) \