summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2022-09-29 21:43:42 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-09-29 21:43:42 +0000
commit0ee21a8145881a285d913b9ffe09a2b2fddc86a8 (patch)
tree798cba8c3d472f0715460edaca3f71d5628fa3e8
parentda8d6b8f58f44a4de558bb194553dfac5d0df6be (diff)
parent08ed2d32bf271ea78ed30605c76f89b4684c5a7c (diff)
downloadboringssl-0ee21a8145881a285d913b9ffe09a2b2fddc86a8.tar.gz
Merge "Don't link libcrypto against libc++" am: 67c78cae21 am: 75ca034865 am: 29feb48deb am: 08ed2d32bf
Original change: https://android-review.googlesource.com/c/platform/external/boringssl/+/2234908 Change-Id: I05a9a408b95dd8220b592ae83230b3319e4a79b8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp1
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index d71efa7d..8130929b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -103,6 +103,7 @@ cc_defaults {
},
local_include_dirs: ["src/crypto"],
+ stl: "none",
}
// Boring Crypto Module object file.