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

Unified Diff: testing/gtest.gyp

Issue 1466413002: Update gtest to 786564fa4a3c, switch to googlemock in gtest Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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/gmock.gyp ('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 79d7e669800e3a1614df0027537bc52c951a9b0d..bde12cf464e3d910fc54d5e89f20e187037e742d 100644
--- a/testing/gtest.gyp
+++ b/testing/gtest.gyp
@@ -15,8 +15,8 @@
'<@(gtest_sources)',
],
'include_dirs': [
- 'gtest',
- 'gtest/include',
+ 'gtest/googletest',
+ 'gtest/googletest/include',
],
'dependencies': [
'gtest_prod',
@@ -159,7 +159,7 @@
'UNIT_TEST',
],
'include_dirs': [
- 'gtest/include', # So that gtest headers can find themselves.
+ 'gtest/googletest/include', # So that gtest headers can find themselves.
],
'target_conditions': [
['_type=="executable"', {
@@ -207,7 +207,7 @@
'gtest',
],
'sources': [
- 'gtest/src/gtest_main.cc',
+ 'gtest/googletest/src/gtest_main.cc',
],
},
{
@@ -215,7 +215,7 @@
'toolsets': ['host', 'target'],
'type': 'none',
'sources': [
- 'gtest/include/gtest/gtest_prod.h',
+ 'gtest/googletest/include/gtest/googletest/gtest_prod.h',
],
},
],
« no previous file with comments | « testing/gmock.gyp ('k') | testing/gtest.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698