commit eb6e294febe774e1878d9e8434a55e44d49cd8af
author Ying Wang <wangying@google.com> Wed Mar 09 17:05:10 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 09 17:05:10 2011 -0800
tree 8f3105647568b60e193683184ffddb82e25fbeee
parent 51b8edb5173e84eb54fd5f7ad34fc0f67c31f5cf
parent f8a7ff191af760ee01e5c31f154f0dbc7abfef7e

am f8a7ff19: resolved conflicts for merge of 123995f9 to honeycomb-plus-aosp

* commit 'f8a7ff191af760ee01e5c31f154f0dbc7abfef7e':
  Dist build.prop in sdk builds.

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index e5824db..a5ee6d1 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -830,9 +830,10 @@
 sdk: $(ALL_SDK_TARGETS)
 ifneq ($(filter sdk win_sdk,$(MAKECMDGOALS)),)
 $(call dist-for-goals,sdk win_sdk, \
-	$(ALL_SDK_TARGETS) \
-	$(SYMBOLS_ZIP) \
- )
+    $(ALL_SDK_TARGETS) \
+    $(SYMBOLS_ZIP) \
+    $(INSTALLED_BUILD_PROP_TARGET) \
+)
 endif
 
 .PHONY: samplecode