diff options
| author | Jerome Gaillard <jgaillard@google.com> | 2019-03-18 05:50:28 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-18 05:50:28 -0700 |
| commit | 570d57488d3e0dd5652b8482d63a1fdbe77d37cd (patch) | |
| tree | 3709c9aa7f5ca32616cc0797fdddb3057ddc20d3 | |
| parent | f33c160f11f5abd5c9e2290766a903b1fdc1d6af (diff) | |
| parent | 06ab02a3d9d8d756b9b324228c58f6c61b8903f2 (diff) | |
| download | compiler-rt-android10-qpr1-b-s1-release.tar.gz | |
Merge "Enable libcompiler_rt on Windows" am: fc52259cf2 am: ebb09acfe2android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-release
am: 06ab02a3d9
Change-Id: Iaf9591ea2a0f292f3bb5e507aeccbdfc68c7e30e
| -rw-r--r-- | Android.bp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp index 4191d9259..b8be74026 100644 --- a/Android.bp +++ b/Android.bp @@ -404,7 +404,7 @@ cc_library { 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"], }, |