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

cpp/Android.mk

diff --git a/cpp/Android.mk b/cpp/Android.mk
index 7208789..a170a5e 100644
--- a/cpp/Android.mk
+++ b/cpp/Android.mk
@@ -18,7 +18,9 @@
 
 LOCAL_SRC_FILES := $(rs_cpp_SRC_FILES)
 
+ifneq ($(HOST_OS),windows)
 LOCAL_CLANG := true
+endif
 LOCAL_CFLAGS += $(local_cflags_for_rs_cpp)
 
 LOCAL_SHARED_LIBRARIES := \
@@ -42,7 +44,9 @@
 
 include $(CLEAR_VARS)
 
+ifneq ($(HOST_OS),windows)
 LOCAL_CLANG := true
+endif
 LOCAL_CFLAGS += $(local_cflags_for_rs_cpp)
 
 LOCAL_SDK_VERSION := 8