kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Actually disable RandTest.Fork on iOS.

Browse Source 
TARGET_OS_IPHONE isn't defined without including <TargetConditionals.h>. Oops.
Confirmed now that OPENSSL_IOS gets defined where we expect.

Update-Note: There is some chance this will fail to build on some macOS host
builds of Android? https://codereview.chromium.org/538563002 suggests something
weird happens. However those Android builds of BoringSSL would already be
problematic because they'd set OPENSSL_STATIC_ARMCAP thinking they were iOS.
Thus I've intentionally kept the assumption that __APPLE__ implies a Darwin
target. If it goes through, all is well. If not, we'll learn more about that
configuration and that we likely need to revise our OPENSSL_APPLE definition.

Bug: chromium:890115
Change-Id: I1df73ac2321391d2449edbeb9cfa295fd607f935
Reviewed-on: https://boringssl-review.googlesource.com/32204
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2018-09-30 18:50:26 -05:00 committed by Adam Langley
parent 52483994c8
commit 7c3ce519e8
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/openssl/base.h
View File

@ -65,6 +65,10 @@
#include <stdio.h> #include <stdio.h>
#endif #endif
#if defined(__APPLE__)
#include <TargetConditionals.h>
#endif
// Include a BoringSSL-only header so consumers including this header without // Include a BoringSSL-only header so consumers including this header without
// setting up include paths do not accidentally pick up the system // setting up include paths do not accidentally pick up the system
// opensslconf.h. // opensslconf.h.