webrtc/pc/externalhmac.cc - Issue 1913043003: Revert of Remove the rtc_relative_path GYP variable and similar defines

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/pc/externalhmac.cc

Issue 1913043003: Revert of Remove the rtc_relative_path GYP variable and similar defines (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Created 4 years, 8 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: webrtc/pc/externalhmac.cc

diff --git a/webrtc/pc/externalhmac.cc b/webrtc/pc/externalhmac.cc

index 8eeec111b1fa1723188b81db1417982268a41a2f..d88cfdc7ec3a3e134102b5f274d04709cec6e3a9 100644

--- a/webrtc/pc/externalhmac.cc

+++ b/webrtc/pc/externalhmac.cc

@@ -15,8 +15,13 @@

#include <stdlib.h> // For malloc/free.

extern "C" {

+#ifdef SRTP_RELATIVE_PATH

+#include "crypto_kernel.h" // NOLINT

+#include "srtp.h" // NOLINT

+#else

#include "third_party/libsrtp/srtp/crypto/include/crypto_kernel.h"

#include "third_party/libsrtp/srtp/include/srtp.h"

+#endif // SRTP_RELATIVE_PATH

}

#include "webrtc/base/logging.h"

« no previous file with comments | « webrtc/pc/externalhmac.h ('k') | webrtc/pc/pc.gyp » ('j') | no next file with comments »