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

Commit c77e1025 authored by Petri Gynther's avatar Petri Gynther Committed by Automerger Merge Worker
Browse files

Merge changes Ibac6424f,Ief572e30 am: 345294f4 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9a924bc13b58b513b02b2054a24b76dba87a35c
parents de36af49 345294f4

core/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -2395,13 +2395,19 @@ $(INTERNAL_VENDOR_DEBUG_RAMDISK_TARGET): DEBUG_RAMDISK_DIR := $(PRODUCT_OUT)/deb 
$(INTERNAL_VENDOR_DEBUG_RAMDISK_TARGET): VENDOR_DEBUG_RAMDISK_DIR := $(PRODUCT_OUT)/vendor_debug_ramdisk

$(INTERNAL_VENDOR_DEBUG_RAMDISK_TARGET): $(INTERNAL_VENDOR_RAMDISK_TARGET) $(INSTALLED_DEBUG_RAMDISK_TARGET)

$(INTERNAL_VENDOR_DEBUG_RAMDISK_TARGET): $(MKBOOTFS) $(INTERNAL_VENDOR_DEBUG_RAMDISK_FILES) | $(COMPRESSION_COMMAND_DEPS)

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

	mkdir -p $(TARGET_VENDOR_DEBUG_RAMDISK_OUT)

	touch $(TARGET_VENDOR_DEBUG_RAMDISK_OUT)/force_debuggable

	$(foreach debug_file,$(DEBUG_RAMDISK_FILES), \

	  cp -f $(debug_file) $(patsubst $(DEBUG_RAMDISK_DIR)/%,$(VENDOR_DEBUG_RAMDISK_DIR)/%,$(debug_file)) &&) true

	$(MKBOOTFS) -d $(TARGET_OUT) $(VENDOR_RAMDISK_DIR) $(VENDOR_DEBUG_RAMDISK_DIR) $(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: $@")

	$(copy-file-to-target)

endif



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

INSTALLED_FILES_JSON_VENDOR_DEBUG_RAMDISK := $(INSTALLED_FILES_FILE_VENDOR_DEBUG_RAMDISK:.txt=.json)

$(INSTALLED_FILES_FILE_VENDOR_DEBUG_RAMDISK): .KATI_IMPLICIT_OUTPUTS := $(INSTALLED_FILES_JSON_VENDOR_DEBUG_RAMDISK)

core/main.mk

+6 −0
Original line number Diff line number Diff line
@@ -1497,6 +1497,9 @@ vendorbootimage_debug: $(INSTALLED_VENDOR_DEBUG_BOOTIMAGE_TARGET) 
.PHONY: vendorramdisk

vendorramdisk: $(INSTALLED_VENDOR_RAMDISK_TARGET)



.PHONY: vendorramdisk_debug

vendorramdisk_debug: $(INSTALLED_VENDOR_DEBUG_RAMDISK_TARGET)



.PHONY: productimage

productimage: $(INSTALLED_PRODUCTIMAGE_TARGET)
@@ -1556,6 +1559,7 @@ droidcore: $(filter $(HOST_OUT_ROOT)/%,$(modules_to_install)) \ 
    $(INSTALLED_VENDOR_BOOTIMAGE_TARGET) \

    $(INSTALLED_VENDOR_DEBUG_BOOTIMAGE_TARGET) \

    $(INSTALLED_VENDOR_RAMDISK_TARGET) \

    $(INSTALLED_VENDOR_DEBUG_RAMDISK_TARGET) \

    $(INSTALLED_ODMIMAGE_TARGET) \

    $(INSTALLED_VENDOR_DLKMIMAGE_TARGET) \

    $(INSTALLED_ODM_DLKMIMAGE_TARGET) \
@@ -1740,6 +1744,8 @@ else ifeq (,$(TARGET_BUILD_UNBUNDLED)) 
      $(INSTALLED_DEBUG_RAMDISK_TARGET) \

      $(INSTALLED_DEBUG_BOOTIMAGE_TARGET) \

      $(INSTALLED_VENDOR_DEBUG_BOOTIMAGE_TARGET) \

      $(INSTALLED_VENDOR_RAMDISK_TARGET) \

      $(INSTALLED_VENDOR_DEBUG_RAMDISK_TARGET) \

    )

    $(call dist-for-goals, bootimage_test_harness, \

      $(INSTALLED_TEST_HARNESS_RAMDISK_TARGET) \