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

Issue 1898283002: Fix compilation of rtc_base_objc on iOS when building as part of Chromium. (Closed)

Created:
4 years, 8 months ago by sdefresne
Modified:
4 years, 8 months ago
CC:
tterriberry_mozilla.com, webrtc-reviews_webrtc.org
Base URL:
https://chromium.googlesource.com/external/webrtc.git@master
Target Ref:
refs/pending/heads/master
Project:
webrtc
Visibility:
Public.

Description

Fix compilation of rtc_base_objc on iOS when building as part of Chromium. When building as part of Chromium, webrtc/base/logging.h is overridden by webrtc_overrides/webrtc/base/logging.h that uses Chromium logging macros. The implementation of webrtc/base/objc/RTCFileLogger.{h,mm} however has dependency on the webrtc implementation of logging as it define a class that inherits from rtc::LogSink. Since the class does not exists when the overrides are used, the file fails compilation. Fixes the compilation for iOS as part of Chromium by not compiling the file webrtc/base/objc/RTCFileLogger.{h,mm} in that configuration. BUG=459705 Committed: https://crrev.com/1a0c4611d7921216287c5dac0fa61b390a7ea915 Cr-Commit-Position: refs/heads/master@{#12438}

Patch Set 1 #

Patch Set 2 : Update webrtc/base/base.gyp #

Unified diffs Side-by-side diffs Delta from patch set Stats (+13 lines, -4 lines) Patch
M webrtc/base/BUILD.gn View 2 chunks +7 lines, -2 lines 0 comments Download
M webrtc/base/base.gyp View 1 2 chunks +6 lines, -2 lines 0 comments Download

Messages

Total messages: 12 (4 generated)
sdefresne
Please take a look. This fixes the following error while building Chromium for iOS: In ...
4 years, 8 months ago (2016-04-19 18:16:07 UTC) #2
kjellander_webrtc
lg, but can you do a similar change to https://chromium.googlesource.com/external/webrtc/+/master/webrtc/base/base.gyp#41 ? We're going to maintain ...
4 years, 8 months ago (2016-04-19 20:22:17 UTC) #3
sdefresne
Done. PTAL.
4 years, 8 months ago (2016-04-20 07:47:23 UTC) #4
kjellander_webrtc
lgtm +tkchin FYI
4 years, 8 months ago (2016-04-20 08:12:05 UTC) #6
sdefresne
Thank you for the reviews.
4 years, 8 months ago (2016-04-20 08:18:13 UTC) #8
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1898283002/20001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1898283002/20001
4 years, 8 months ago (2016-04-20 08:18:23 UTC) #9
commit-bot: I haz the power
Committed patchset #2 (id:20001)
4 years, 8 months ago (2016-04-20 08:44:58 UTC) #10
commit-bot: I haz the power
4 years, 8 months ago (2016-04-20 08:45:09 UTC) #12
Message was sent while issue was closed.
Patchset 2 (id:??) landed as
https://crrev.com/1a0c4611d7921216287c5dac0fa61b390a7ea915
Cr-Commit-Position: refs/heads/master@{#12438}

Powered by Google App Engine
This is Rietveld 408576698