summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Crane <sjc@immunant.com>2021-03-12 21:45:29 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-12 21:45:29 +0000
commit677e1d6aa8f085f6ae42d15217d32735c08a8661 (patch)
treed7658bfe3ff7b6c344d296ccce608bae4a97de9d
parent2de7559e47c141dcdb33fad468146c22a7c06228 (diff)
parent14a53cdcd5d662701791c7ea54d8a0ec17802b87 (diff)
downloadboringssl-677e1d6aa8f085f6ae42d15217d32735c08a8661.tar.gz
Trusty: Build boringssl with C++ support am: 14a53cdcd5
Original change: https://android-review.googlesource.com/c/platform/external/boringssl/+/1587598 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5446b496c4757bc753a0a95b6b22fd557c3d54e7
-rw-r--r--rules.mk4
1 files changed, 0 insertions, 4 deletions
diff --git a/rules.mk b/rules.mk
index 5f96f687..9b2668e9 100644
--- a/rules.mk
+++ b/rules.mk
@@ -70,10 +70,6 @@ LOCAL_C_INCLUDES := src/crypto src/include
GLOBAL_INCLUDES += $(addprefix $(LOCAL_DIR)/,$(LOCAL_C_INCLUDES))
-# BoringSSL expects an STL to be available when building for C++11 to provide
-# scopers. Suppress those APIs.
-GLOBAL_CPPFLAGS += -DBORINGSSL_NO_CXX
-
MODULE_DEPS := \
lib/openssl-stubs \