commit 59f9c4445c6355b7749f9407195cc2156ad9f5fa
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Feb 02 09:15:46 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Feb 02 09:15:46 2022 +0000
tree cbb4ed85bdf28c32a97fec1d1fdb917a4869a3cb
parent 62215a9830a8e3b3438f2d9ca5227413396c2c0b
parent 1b7cc87c790e88ecee0f6b5e314cc849336ac4fc

Snap for 8140651 from 1b7cc87c790e88ecee0f6b5e314cc849336ac4fc to sdk-release

Change-Id: Ie0511192b1dfddb3696ccbf09a104cdc312598e3

Android.bp

diff --git a/Android.bp b/Android.bp
index 0fd4ffe..416bfd8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -51,7 +51,6 @@
         "-DBORINGSSL_SHARED_LIBRARY",
         "-DBORINGSSL_ANDROID_SYSTEM",
         "-DOPENSSL_SMALL",
-        "-D_XOPEN_SOURCE=700",
         "-Werror",
         "-Wno-unused-parameter",
     ],
@@ -66,6 +65,12 @@
     // Build BoringSSL and its tests against the same STL.
     sdk_version: "9",
     target: {
+        linux: {
+            cflags: ["-D_XOPEN_SOURCE=700"],
+        },
+        windows: {
+            cflags: ["-D_XOPEN_SOURCE=700"],
+        },
         android: {
             stl: "libc++_static",
         },
@@ -364,6 +369,7 @@
 
     apex_available: [
         "//apex_available:platform",
+        "com.android.bluetooth",
         "com.android.adbd",
         "com.android.conscrypt",
         "com.android.resolv",