Merge branch 'eclair' into eclair-release

2009-10-13 13:40:13 -07:00
parent fcb5a15a46 aa569862de
commit 23a24dead4
1 changed files with 2 additions and 0 deletions
--- a/core/main.mk
+++ b/core/main.mk
@@ -357,6 +357,7 @@ subdirs := \
 	dalvik/tools/hprof-conv \
 	development/emulator/mksdcard \
 	development/tools/line_endings \
+	development/tools/sdklauncher \
 	development/host \
 	external/expat \
 	external/libpng \
@@ -390,6 +391,7 @@ subdirs += \
 	development/tools/sdkstats \
 	development/tools/sdkmanager \
 	development/tools/mkstubs \
+	development/tools/layoutopt \
 	frameworks/base \
 	frameworks/base/tools/layoutlib \
 	external/googleclient \