commit 266a571fbd557c402e937130922ced8c523dd451
author Raphael Moll <ralf@android.com> Fri Jul 29 13:56:51 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 29 13:56:51 2011 -0700
tree a38d64ff8c35cd1b2f6c000ea9e7e5160bfe0581
parent 1708a6f74bf36ad6d520476895695c26bdaf7306
parent dceb46559eb8077553d1bd4d738fb4b325af9396

am dceb4655: Merge "Add sdk/assetstudio to the Windows build paths."

* commit 'dceb46559eb8077553d1bd4d738fb4b325af9396':
  Add sdk/assetstudio to the Windows build paths.

core/tasks/sdk-addon.mk

diff --git a/core/tasks/sdk-addon.mk b/core/tasks/sdk-addon.mk
index 8408676..2641a31 100644
--- a/core/tasks/sdk-addon.mk
+++ b/core/tasks/sdk-addon.mk
@@ -58,6 +58,7 @@
         $(BUILT_SYSTEMIMAGE):images/$(TARGET_CPU_ABI)/system.img \
         $(BUILT_USERDATAIMAGE_TARGET):images/$(TARGET_CPU_ABI)/userdata.img \
         $(BUILT_RAMDISK_TARGET):images/$(TARGET_CPU_ABI)/ramdisk.img \
+        $(ANDROID_PRODUCT_OUT)/system/build.prop:images/$(TARGET_CPU_ABI)/build.prop \
         $(target_notice_file_txt):images/$(TARGET_CPU_ABI)/NOTICE.txt
 
 # Generate rules to copy the requested files