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

Commit 541aea69 authored by SzuWei Lin's avatar SzuWei Lin Committed by android-build-merger
Browse files

Merge "Fix build error for no-ramdisk targets" into qt-dev am: d312ca82 

am: 58db307f

Change-Id: Ia84edcabb358c48f8d46d8e60f1052ba2def231b
parents 8c071b24 58db307f

core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -1995,7 +1995,7 @@ $(INSTALLED_DEBUG_RAMDISK_TARGET): $(MKBOOTFS) $(INTERNAL_DEBUG_RAMDISK_FILES) | 
	$(call pretty,"Target debug ram disk: $@")

	mkdir -p $(TARGET_DEBUG_RAMDISK_OUT)

	touch $(TARGET_DEBUG_RAMDISK_OUT)/force_debuggable

	rsync -a $(DEBUG_RAMDISK_SYNC_DIR)/* $(DEBUG_RAMDISK_ROOT_DIR)

	rsync -a $(DEBUG_RAMDISK_SYNC_DIR)/ $(DEBUG_RAMDISK_ROOT_DIR)

	$(MKBOOTFS) -d $(TARGET_OUT) $(DEBUG_RAMDISK_ROOT_DIR) | $(MINIGZIP) > $@



.PHONY: ramdisk_debug-nodeps
@@ -2005,7 +2005,7 @@ ramdisk_debug-nodeps: $(MKBOOTFS) | $(MINIGZIP) 
	echo "make $@: ignoring dependencies"

	mkdir -p $(TARGET_DEBUG_RAMDISK_OUT)

	touch $(TARGET_DEBUG_RAMDISK_OUT)/force_debuggable

	rsync -a $(DEBUG_RAMDISK_SYNC_DIR)/* $(DEBUG_RAMDISK_ROOT_DIR)

	rsync -a $(DEBUG_RAMDISK_SYNC_DIR)/ $(DEBUG_RAMDISK_ROOT_DIR)

	$(MKBOOTFS) -d $(TARGET_OUT) $(DEBUG_RAMDISK_ROOT_DIR) | $(MINIGZIP) > $(INSTALLED_DEBUG_RAMDISK_TARGET)



my_debug_ramdisk_sync_dir :=