Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1601)

Unified Diff: third_party/boringssl/boringssl_lib.gypi

Issue 428753004: BoringSSL: roll DEPS and enable dynamic visibility. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/boringssl/boringssl_lib.gypi
diff --git a/third_party/boringssl/boringssl_lib.gypi b/third_party/boringssl/boringssl_lib.gypi
index 84a0c6fe3f187aca370e9a88b93376a4f377945d..cbdd63387931687e4174a3cf3a8f6848d077c54e 100644
--- a/third_party/boringssl/boringssl_lib.gypi
+++ b/third_party/boringssl/boringssl_lib.gypi
@@ -13,7 +13,14 @@
'sources': [
'<@(boringssl_lib_sources)',
],
+ 'defines': [ 'BORINGSSL_IMPLEMENTATION' ],
'conditions': [
+ ['component == "shared_library"', {
+ 'defines': [
+ 'BORINGSSL_SHARED_LIBRARY',
+ 'BORINGSSL_IMPLEMENTATION',
davidben 2014/08/01 17:59:47 This is redundant with line 16. The line 16 versio
agl 2014/08/01 21:05:23 Done.
+ ],
+ }],
['target_arch == "arm"', {
'sources': [ '<@(boringssl_linux_arm_sources)' ],
}],
@@ -49,19 +56,6 @@
['target_arch != "arm" and target_arch != "ia32" and target_arch != "x64"', {
'defines': [ 'OPENSSL_NO_ASM' ],
}],
- ['component == "shared_library"', {
- 'xcode_settings': {
- 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # no -fvisibility=hidden
- },
- 'cflags!': [ '-fvisibility=hidden' ],
- 'conditions': [
- ['os_posix == 1 and OS != "mac"', {
- # Avoid link failures on Linux x86-64.
- # See http://rt.openssl.org/Ticket/Display.html?id=2466&user=guest&pass=guest
- 'ldflags+': [ '-Wl,-Bsymbolic' ],
- }],
- ],
- }],
],
'include_dirs': [
'src/include',
@@ -74,6 +68,13 @@
'include_dirs': [
'src/include',
],
+ 'conditions': [
+ ['component == "shared_library"', {
+ 'defines': [
+ 'BORINGSSL_SHARED_LIBRARY',
+ ],
+ }],
+ ],
},
},
],

Powered by Google App Engine
This is Rietveld 408576698