commit feec1ce3e01c93f43f425747df8073e9580d775a
author Raphael <raphael@google.com> Tue Oct 13 12:17:40 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 13 12:17:40 2009 -0700
tree 9ce6b65895bad517ac73759c85f6fc0a44b4bfd1
parent 3f7405e9940db18fade6fb86899bb8b88bd67bcf
parent aa569862dee45bfa72d342e9982cb5205df9bf04

am aa569862: Windows SDK: support tools/sdklauncher and tools/layoutopt

Merge commit 'aa569862dee45bfa72d342e9982cb5205df9bf04' into eclair-mr2

* commit 'aa569862dee45bfa72d342e9982cb5205df9bf04':
  Windows SDK: support tools/sdklauncher and tools/layoutopt

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index e7f97f0..a07172d 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -357,6 +357,7 @@
 	dalvik/tools/hprof-conv \
 	development/emulator/mksdcard \
 	development/tools/line_endings \
+	development/tools/sdklauncher \
 	development/host \
 	external/expat \
 	external/libpng \
@@ -390,6 +391,7 @@
 	development/tools/sdkstats \
 	development/tools/sdkmanager \
 	development/tools/mkstubs \
+	development/tools/layoutopt \
 	frameworks/base \
 	frameworks/base/tools/layoutlib \
 	external/googleclient \