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

Unified Diff: testing/gtest_nacl.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/gtest.gypi ('k') | testing/testing/gtest/include/gtest/gtest.h » ('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 910c9e37890dfb8b221bfd36a8c211cb04c5448e..9359fdcacb69b3cf24cc5192f68808f2228d1411 100644
--- a/testing/gtest_nacl.gyp
+++ b/testing/gtest_nacl.gyp
@@ -28,8 +28,8 @@
'<@(gtest_sources)',
],
'include_dirs': [
- 'gtest',
- 'gtest/include',
+ '../third_party/gtest/googletest',
+ '../third_party/gtest/googletest/include',
],
'defines': [
# In order to allow regex matches in gtest to be shared between
@@ -50,7 +50,7 @@
'UNIT_TEST',
],
'include_dirs': [
- 'gtest/include', # So that gtest headers can find themselves.
+ '../third_party/gtest/googletest/include', # So that gtest headers can find themselves.
],
},
},
@@ -69,7 +69,7 @@
'gtest_nacl',
],
'sources': [
- 'gtest/src/gtest_main.cc',
+ '../third_party/gtest/googletest/src/gtest_main.cc',
],
'all_dependent_settings': {
'link_flags': [
« no previous file with comments | « testing/gtest.gypi ('k') | testing/testing/gtest/include/gtest/gtest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698