commit 2dbd5513a459b9379d66b8c6bda58d97cf6e467a
author Pirama Arumuga Nainar <pirama@google.com> Fri Sep 11 04:53:20 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 11 04:53:20 2020 +0000
tree 90bc0582b2d46b04f342e9db33647ea69c49b957
parent 7d682767f628d80882597a0765683d99cf4902ea
parent aedd7d44ccdf5b6a5432b0b9aa645b558d7e7fb5

Do not set -fsjlj-exceptions locally for Windows am: 3364b1d8fc am: cdc7e53d06 am: 38490df053 am: aedd7d44cc

Original change: https://android-review.googlesource.com/c/platform/external/libcxxabi/+/1424492

Change-Id: I9b3dc2626a658fb078dc477cfc38795c12584fe1

Android.bp

diff --git a/Android.bp b/Android.bp
index fbd4a62..d74d1e6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -132,11 +132,6 @@
                 "src/stdlib_new_delete.cpp",
             ],
         },
-        windows_x86: {
-            cppflags: [
-                "-fsjlj-exceptions",
-            ],
-        },
     },
     apex_available: [
         "//apex_available:platform",