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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: testing/gtest_nacl.gyp

Issue 2169193002: Re-land: Roll gtest. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 | « 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: testing/gtest_nacl.gyp
diff --git a/testing/gtest_nacl.gyp b/testing/gtest_nacl.gyp
index d1c0ce0fb40387f8138f57e1e4ce0dad3a1fbeb0..5ad8d7a9dbd5ffb97eb2f4f32ef98d7459c7c06e 100644
--- a/testing/gtest_nacl.gyp
+++ b/testing/gtest_nacl.gyp
@@ -28,8 +28,8 @@
'<@(gtest_sources)',
],
'include_dirs': [
- 'gtest',
- 'gtest/include',
+ 'third_party/googletest/googletest',
+ 'third_party/googletest/googletest/include',
],
'defines': [
# In order to allow regex matches in gtest to be shared between
@@ -61,7 +61,7 @@
'GTEST_HAS_RTTI=0',
],
'include_dirs': [
- 'gtest/include', # So that gtest headers can find themselves.
+ 'third_party/googletest/googletest/include', # So that gtest headers can find themselves.
],
},
},
@@ -80,7 +80,7 @@
'gtest_nacl',
],
'sources': [
- 'gtest/src/gtest_main.cc',
+ 'third_party/googletest/googletest/src/gtest_main.cc',
],
'all_dependent_settings': {
'link_flags': [
« no previous file with comments | « 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