diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree
index 7eac71e13..f2ab98539 100644
--- a/build/sdk-windows-x86.atree
+++ b/build/sdk-windows-x86.atree
@@ -59,25 +59,26 @@ dalvik/dx/etc/dx.bat                          build-tools/${PLATFORM_NAME}/dx.ba
 rm build-tools/${PLATFORM_NAME}/dexdump
 bin/dexdump.exe                         strip build-tools/${PLATFORM_NAME}/dexdump.exe
 
-rm build-tools/${PLATFORM_NAME}/llvm-rs-cc
-bin/llvm-rs-cc.exe                      strip build-tools/${PLATFORM_NAME}/llvm-rs-cc.exe
-
-rm build-tools/${PLATFORM_NAME}/libLLVM.so
-lib/libLLVM.dll                         strip build-tools/${PLATFORM_NAME}/libLLVM.dll
-
-rm build-tools/${PLATFORM_NAME}/libclang.so
-lib/libclang.dll                        strip build-tools/${PLATFORM_NAME}/libclang.dll
-
-#bcc not yet compiled on windows
-
-rm build-tools/${PLATFORM_NAME}/libbcc.so
-lib/libbcc.dll                          strip build-tools/${PLATFORM_NAME}/libbcc.dll
-
-rm build-tools/${PLATFORM_NAME}/libbcinfo.so
-lib/libbcinfo.dll                       strip build-tools/${PLATFORM_NAME}/libbcinfo.dll
-
-rm build-tools/${PLATFORM_NAME}/bcc_compat
-bin/bcc_compat.exe                      strip build-tools/${PLATFORM_NAME}/bcc_compat.exe
+###RM(2014-05-02) Temporarily disable rs/bcc for the Windows SDK as we fix cross-compilation issues
+###rm build-tools/${PLATFORM_NAME}/llvm-rs-cc
+###bin/llvm-rs-cc.exe                      strip build-tools/${PLATFORM_NAME}/llvm-rs-cc.exe
+###
+###rm build-tools/${PLATFORM_NAME}/libLLVM.so
+###lib/libLLVM.dll                         strip build-tools/${PLATFORM_NAME}/libLLVM.dll
+###
+###rm build-tools/${PLATFORM_NAME}/libclang.so
+###lib/libclang.dll                        strip build-tools/${PLATFORM_NAME}/libclang.dll
+###
+####bcc not yet compiled on windows
+###
+###rm build-tools/${PLATFORM_NAME}/libbcc.so
+###lib/libbcc.dll                          strip build-tools/${PLATFORM_NAME}/libbcc.dll
+###
+###rm build-tools/${PLATFORM_NAME}/libbcinfo.so
+###lib/libbcinfo.dll                       strip build-tools/${PLATFORM_NAME}/libbcinfo.dll
+###
+###rm build-tools/${PLATFORM_NAME}/bcc_compat
+###bin/bcc_compat.exe                      strip build-tools/${PLATFORM_NAME}/bcc_compat.exe
 
 rm build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld
 prebuilts/sdk/tools/windows/arm-linux-androideabi-ld.exe   strip build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld.exe
diff --git a/build/tools/windows_sdk.mk b/build/tools/windows_sdk.mk
index 5d2830f4f..aaf8fa465 100644
--- a/build/tools/windows_sdk.mk
+++ b/build/tools/windows_sdk.mk
@@ -32,17 +32,28 @@ include $(TOPDIR)sdk/build/windows_sdk_tools.mk
 # the topdir/development directory and are somehow platform-dependent.
 WIN_TARGETS := \
 	aapt adb aidl \
-	bcc_compat \
 	etc1tool \
 	dexdump dmtracedump \
 	fastboot \
 	hprof-conv \
-	llvm-rs-cc \
 	prebuilt \
 	sqlite3 \
 	zipalign \
 	$(WIN_SDK_TARGETS)
-
+###RM(2014-05-02) full list of WIN_TARGS, including bcc/rs that are temporarily deactivated
+###WIN_TARGETS := \
+###	aapt adb aidl \
+###	bcc_compat \
+###	etc1tool \
+###	dexdump dmtracedump \
+###	fastboot \
+###	hprof-conv \
+###	llvm-rs-cc \
+###	prebuilt \
+###	sqlite3 \
+###	zipalign \
+###	$(WIN_SDK_TARGETS)
+###
 # This is the list of *Linux* build tools that we need
 # in order to be able to make the WIN_TARGETS. They are
 # build prerequisites.