summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Crane <sjc@immunant.com>2021-03-12 23:43:43 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-12 23:43:43 +0000
commit3bb75e6b6054a5e55539e8c7e95e23ed53b1d4fc (patch)
treed7658bfe3ff7b6c344d296ccce608bae4a97de9d
parent580c2ff9ef7fd6959c17394b3659013b4373d374 (diff)
parent4fc5dfb102240552a7b3fc5eb2367a0714df238f (diff)
downloadboringssl-3bb75e6b6054a5e55539e8c7e95e23ed53b1d4fc.tar.gz
Trusty: Build boringssl with C++ support am: 14a53cdcd5 am: 677e1d6aa8 am: 41b7c73884 am: 4fc5dfb102
Original change: https://android-review.googlesource.com/c/platform/external/boringssl/+/1587598 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6d34fc425cdf1451f4d94752a4242e0b57e2afef
-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 \