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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/libjingle/libjingle.gyp

Issue 2224323003: WIP roll gtest/gmock DEPS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
« no previous file with comments | « testing/testing/gtest/include/gtest/internal/gtest-type-util.h ('k') | tools/checklicenses/checklicenses.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libjingle/libjingle.gyp
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 85a3f12eb2d0db603582800d9bf239933006f8b5..45bb05590af829906b39b395b20584566749b37a 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -12,8 +12,8 @@
'include_dirs': [
'../../third_party/webrtc_overrides',
'../..',
- '../../testing/gtest/include',
'../../third_party',
+ '../../third_party/gtest/googletest/include',
'../../third_party/libyuv/include',
'../../third_party/usrsctp/usrsctplib',
],
@@ -29,10 +29,10 @@
],
'direct_dependent_settings': {
'include_dirs': [
- '../../third_party/webrtc_overrides',
'../..',
- '../../testing/gtest/include',
'../../third_party',
+ '../../third_party/gtest/googletest/include',
+ '../../third_party/webrtc_overrides',
],
'conditions': [
['OS=="win"', {
« no previous file with comments | « testing/testing/gtest/include/gtest/internal/gtest-type-util.h ('k') | tools/checklicenses/checklicenses.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698