am f15e028f: am a62a4421: Fix the Windows SDK build for the development to sdk split.

Merge commit 'f15e028fe822069e44b0e06fa91f537048538f94' into eclair-mr2

* commit 'f15e028fe822069e44b0e06fa91f537048538f94':
  Fix the Windows SDK build for the development to sdk split.

diff --cc core/main.mk
index 2778b3c,45c81c0..0724dcc
--- 1/core/main.mk
--- 2/core/main.mk
+++ b/core/main.mk
@@@ -380,19 -380,20 +380,19 @@@ subdirs += 
        build/tools/signapk \
        dalvik/dx \
        dalvik/libcore \
+       sdk/archquery \
+       sdk/androidprefs \
+       sdk/apkbuilder \
+       sdk/jarutils \
+       sdk/layoutlib_utils \
+       sdk/ninepatch \
+       sdk/sdkstats \
+       sdk/sdkmanager \
+       sdk/layoutopt \
        development/apps \
-       development/tools/archquery \
-       development/tools/androidprefs \
-       development/tools/apkbuilder \
-       development/tools/jarutils \
-       development/tools/layoutlib_utils \
-       development/tools/ninepatch \
-       development/tools/sdkstats \
-       development/tools/sdkmanager \
        development/tools/mkstubs \
-       development/tools/layoutopt \
        frameworks/base \
        frameworks/base/tools/layoutlib \
 -      external/googleclient \
        packages
  else
  $(warning sdk-only: javac not available.)