Snap for 5067452 from 609d24d324d3309666354c73ae794bbff63d9c5d to qt-release

Change-Id: I0bc5ddaed05ac1cc55b60a6b36991eb396213cff

1 files changed, 24 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index a73be13..2a84000 100644
--- a/Android.bp
+++ b/Android.bp
@@ -95,6 +95,30 @@ cc_library_static {
             cppflags: ["-DHAVE___CXA_THREAD_ATEXIT_IMPL"],
             enabled: true,
         },
+        windows: {
+            enabled: true,
+            cppflags: [
+                "-D_LIBCPP_HAS_THREAD_API_WIN32",
+                "-D_LIBCXXABI_BUILDING_LIBRARY",
+                "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
+                "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
+            ],
+            exclude_srcs: [
+                "src/cxa_thread_atexit.cpp",
+
+                // Building stdlib_new_delete.cpp in libcxxabi causes
+                // multiple-definition errors against definitions in
+                // libcxx/src/new.cpp on Windows.  This works on Linux and
+                // Android where the functions have 'weak' linkage and are
+                // discarded by the linker.
+                "src/stdlib_new_delete.cpp",
+            ],
+        },
+        windows_x86: {
+            cppflags: [
+                "-fsjlj-exceptions",
+            ],
+        }
     },
 
 }