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

Unified Diff: testing/gtest.gyp

Issue 2171663002: Revert of Roll gtest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « net/socket/sequenced_socket_data_unittest.cc ('k') | testing/gtest.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/gtest.gyp
diff --git a/testing/gtest.gyp b/testing/gtest.gyp
index 32e411f6165c5814006bc9a7fd8915799bdbd60b..dd9435eab57e82cb654af398456d989f031c111b 100644
--- a/testing/gtest.gyp
+++ b/testing/gtest.gyp
@@ -15,8 +15,8 @@
'<@(gtest_sources)',
],
'include_dirs': [
- 'third_party/googletest/googletest',
- 'third_party/googletest/googletest/include',
+ 'gtest',
+ 'gtest/include',
],
'dependencies': [
'gtest_prod',
@@ -158,7 +158,7 @@
'UNIT_TEST',
],
'include_dirs': [
- 'third_party/googletest/googletest/include', # So that gtest headers can find themselves.
+ 'gtest/include', # So that gtest headers can find themselves.
],
'target_conditions': [
['_type=="executable"', {
@@ -198,7 +198,7 @@
'gtest',
],
'sources': [
- 'third_party/googletest/googletest/src/gtest_main.cc',
+ 'gtest/src/gtest_main.cc',
],
},
{
@@ -207,7 +207,6 @@
'type': 'none',
'sources': [
'gtest/include/gtest/gtest_prod.h',
- 'third_party/googletest/googletest/include/gtest/gtest_prod.h',
],
},
],
« no previous file with comments | « net/socket/sequenced_socket_data_unittest.cc ('k') | testing/gtest.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698