From c1254e84a5bfeee0e18721ef7d911f9332d0c60c Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Thu, 17 Dec 2020 15:56:13 +0100 Subject: [PATCH] Make RTC_OBJC_EXPORT respect is_component_build. While RTC_EXPORT is aware of component builds (selecting "default" visibility only when WebRTC is built as a shared library), RTC_OBJC_EXPORT (which predates RTC_EXPORT) was always marking symbols as "default" visible. This CL fixes the problem but on the other hand it will require standalone builds of the WebRTC.framework to set the GN argument `rtc_enable_symbol_export` to true. No-Presubmit: True Bug: chromium:1159620 Change-Id: I4a16f9bd3c1564140a5a30f03b3e77caed1df591 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/198082 Commit-Queue: Mirko Bonadei Reviewed-by: Henrik Andreassson Reviewed-by: Nico Weber Cr-Commit-Position: refs/heads/master@{#32856} --- sdk/objc/base/RTCMacros.h | 14 ++++++++++++-- tools_webrtc/ios/build_ios_libs.py | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sdk/objc/base/RTCMacros.h b/sdk/objc/base/RTCMacros.h index e527ff6bc4..b5a79113b8 100644 --- a/sdk/objc/base/RTCMacros.h +++ b/sdk/objc/base/RTCMacros.h @@ -11,6 +11,18 @@ #ifndef SDK_OBJC_BASE_RTCMACROS_H_ #define SDK_OBJC_BASE_RTCMACROS_H_ +#ifdef WEBRTC_ENABLE_SYMBOL_EXPORT + +#if defined(WEBRTC_LIBRARY_IMPL) +#define RTC_OBJC_EXPORT __attribute__((visibility("default"))) +#endif + +#endif // WEBRTC_ENABLE_SYMBOL_EXPORT + +#ifndef RTC_OBJC_EXPORT +#define RTC_OBJC_EXPORT +#endif + // Internal macros used to correctly concatenate symbols. #define RTC_SYMBOL_CONCAT_HELPER(a, b) a##b #define RTC_SYMBOL_CONCAT(a, b) RTC_SYMBOL_CONCAT_HELPER(a, b) @@ -35,8 +47,6 @@ // that will be affected by the configurable RTC_OBJC_TYPE_PREFIX. #define RTC_OBJC_TYPE(type_name) RTC_SYMBOL_CONCAT(RTC_OBJC_TYPE_PREFIX, type_name) -#define RTC_OBJC_EXPORT __attribute__((visibility("default"))) - #if defined(__cplusplus) #define RTC_EXTERN extern "C" RTC_OBJC_EXPORT #else diff --git a/tools_webrtc/ios/build_ios_libs.py b/tools_webrtc/ios/build_ios_libs.py index 1971c3e07e..65ad6d3f5e 100755 --- a/tools_webrtc/ios/build_ios_libs.py +++ b/tools_webrtc/ios/build_ios_libs.py @@ -146,6 +146,7 @@ def BuildWebRTC(output_dir, target_arch, flavor, gn_target_name, gn_args.append('enable_ios_bitcode=' + ('true' if use_bitcode else 'false')) gn_args.append('use_goma=' + ('true' if use_goma else 'false')) + gn_args.append('rtc_enable_symbol_export=true') args_string = ' '.join(gn_args + extra_gn_args) logging.info('Building WebRTC with args: %s', args_string)