commit 8d50174ff0e80bc3846f9dfd6f7d154fc4949db4
author Logan Chien <tzuhsiang.chien@gmail.com> Mon May 26 23:07:47 2014 +0800
committer Andrew Hsieh <andrewhsieh@google.com> Fri Jun 13 16:24:01 2014 -0700
tree a564c030c29b913aac052bc5ce5aecf21ffb2bcf
parent f6328b8db3b5de20fb27812157db2ff8bda4669c

Fix Windows SDK build.

* Use gcc instead of clang in order to get proper exception support.
* Use libstdc++ instead of libc++ since gcc does not support _Atomic.
* Fix various 32/64 typing in linkloader.

Change-Id: I34abcf1e9fa98633e0fd35b4e1b71a0d5389008a

Android.mk

diff --git a/Android.mk b/Android.mk
index cde93b6..48b9c2c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,7 +15,9 @@
 endif
 
 include $(CLEAR_VARS)
+ifneq ($(HOST_OS),windows)
 LOCAL_CLANG := true
+endif
 LOCAL_MODULE := libRSDriver
 LOCAL_MODULE_TARGET_ARCH_WARN := arm mips mips64 x86 x86_64 arm64
 
@@ -79,7 +81,9 @@
 RSG_GENERATOR:=$(LOCAL_BUILT_MODULE)
 
 include $(CLEAR_VARS)
+ifneq ($(HOST_OS),windows)
 LOCAL_CLANG := true
+endif
 LOCAL_MODULE := libRS
 LOCAL_MODULE_TARGET_ARCH_WARN := arm mips mips64 x86 x86_64 arm64
 
@@ -309,7 +313,9 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := librsloader
+ifneq ($(HOST_OS),windows)
 LOCAL_CLANG := true
+endif
 
 LOCAL_MODULE_TAGS := optional
 
@@ -325,11 +331,18 @@
 LOCAL_CFLAGS += -D__HOST__
 LOCAL_CPPFLAGS += -fno-exceptions
 
+ifeq ($(HOST_OS),windows)
+LOCAL_C_INCLUDES := \
+  $(LOCAL_PATH)/cpu_ref/linkloader \
+  $(LOCAL_PATH)/cpu_ref/linkloader/include \
+  $(LOCAL_C_INCLUDES)
+else
 LOCAL_C_INCLUDES := \
   $(LOCAL_PATH)/cpu_ref/linkloader \
   $(LOCAL_PATH)/cpu_ref/linkloader/include \
   external/libcxx/include \
   $(LOCAL_C_INCLUDES)
+endif
 
 include $(LLVM_ROOT_PATH)/llvm-host-build.mk
 include $(BUILD_HOST_STATIC_LIBRARY)