commit fcf60d8f8a86f2b6485ea53001c5f253fa0b859e
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jun 01 05:01:50 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 01 05:01:50 2018 +0000
tree e0e4ade31663518f047faab55bc809afae9a1dc1
parent 2b7b307a4b948aa4346da6bb88b11c101c6686ba
parent d61ff0f5e2616f9e4bdd01f58cf9d712e8162f26

Merge "Do not copy userdata.img into sdk_addon/system-image.zip" into pi-dev

core/tasks/sdk-addon.mk

diff --git a/core/tasks/sdk-addon.mk b/core/tasks/sdk-addon.mk
index 197d41a..2a20f07 100644
--- a/core/tasks/sdk-addon.mk
+++ b/core/tasks/sdk-addon.mk
@@ -65,7 +65,6 @@
 files_to_copy += \
 	$(addon_dir_img):$(INSTALLED_QEMU_SYSTEMIMAGE):images/$(TARGET_CPU_ABI)/system.img \
 	$(addon_dir_img):$(INSTALLED_QEMU_VENDORIMAGE):images/$(TARGET_CPU_ABI)/vendor.img \
-	$(addon_dir_img):$(BUILT_USERDATAIMAGE_TARGET):images/$(TARGET_CPU_ABI)/userdata.img \
 	$(addon_dir_img):$(BUILT_RAMDISK_TARGET):images/$(TARGET_CPU_ABI)/ramdisk.img \
 	$(addon_dir_img):$(PRODUCT_OUT)/system/build.prop:images/$(TARGET_CPU_ABI)/build.prop \
 	$(addon_dir_img):$(target_notice_file_txt):images/$(TARGET_CPU_ABI)/NOTICE.txt \