commit d312ca82eda77c01b2ea7c1a60134b86d6d4c196
author SzuWei Lin <szuweilin@google.com> Wed Apr 24 08:57:44 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 24 08:57:44 2019 +0000
tree 6e3c468eb50cc29f3a5faad3d78f18f9d569d454
parent 6e38628664cbe8b4b0fd0c4f7f4ece314cea281e
parent f00885f29942ead37633031e9e7a3f095cdcdae2

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

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 4a531e7..e29d000 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2047,7 +2047,7 @@
 	$(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
@@ -2057,7 +2057,7 @@
 	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 :=