commit 140324c72ceef7ea3066789ca2ba63286bbc8134
author android-build-prod (mdb) <android-build-team-robot@google.com> Sun Mar 21 15:22:08 2021 +0000
committer android-build-prod (mdb) <android-build-team-robot@google.com> Sun Mar 21 15:22:08 2021 +0000
tree 0a5641825b3b9147cd7978829db4670b0b2538f4
parent 0c8d8393b223ec26776f60effaa4af0e95c50037
parent f262136666e1a4f4d1cfe21cc33ca4a8f7b3b5c0

Snap for 7224597 from f262136666e1a4f4d1cfe21cc33ca4a8f7b3b5c0 to sdk-release

Change-Id: Icf043989f7b960183e5c069e65d9b0e22e3756ff

Android.bp

diff --git a/Android.bp b/Android.bp
index 2353188..95fbfb2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -472,6 +472,8 @@
     defaults: [
         "boringssl_flags",
     ],
+
+    visibility: ["//system/core/trusty/utils/acvp"],
 }
 
 // Test support library

rules.mk

diff --git a/rules.mk b/rules.mk
index 5f96f68..9b2668e 100644
--- a/rules.mk
+++ b/rules.mk
@@ -70,10 +70,6 @@
 
 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 \