| commit | 570d57488d3e0dd5652b8482d63a1fdbe77d37cd | [log] [tgz] |
|---|---|---|
| author | Jerome Gaillard <jgaillard@google.com> | Mon Mar 18 05:50:28 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Mar 18 05:50:28 2019 -0700 |
| tree | 3709c9aa7f5ca32616cc0797fdddb3057ddc20d3 | |
| parent | f33c160f11f5abd5c9e2290766a903b1fdc1d6af [diff] | |
| parent | 06ab02a3d9d8d756b9b324228c58f6c61b8903f2 [diff] |
Merge "Enable libcompiler_rt on Windows" am: fc52259cf2 am: ebb09acfe2 am: 06ab02a3d9 Change-Id: Iaf9591ea2a0f292f3bb5e507aeccbdfc68c7e30e
diff --git a/Android.bp b/Android.bp index 4191d92..b8be740 100644 --- a/Android.bp +++ b/Android.bp
@@ -404,7 +404,7 @@ shared_libs: ["liblzma"], }, windows: { - static_libs: ["libunwindbacktrace", "libunwind_static"], + enabled: true, // Only build enable_execute_stack.c on non-Windows hosts. exclude_srcs: ["lib/builtins/enable_execute_stack.c"], },