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

Unified Diff: native_client_sdk/src/tests/sdk_util_test/example.dsc

Issue 1559463002: [NaCl SDK] Don't include gtest/gmock in library form (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 | « native_client_sdk/src/tests/nacl_io_test/example.dsc ('k') | native_client_sdk/src/tools/common.mk » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: native_client_sdk/src/tests/sdk_util_test/example.dsc
diff --git a/native_client_sdk/src/tests/sdk_util_test/example.dsc b/native_client_sdk/src/tests/sdk_util_test/example.dsc
index 334d1da9a8be0e514f0e293b3ae64fc6d98e7d9f..46cf7d1e0ddd6688206948d63d38ccdd15b69ae5 100644
--- a/native_client_sdk/src/tests/sdk_util_test/example.dsc
+++ b/native_client_sdk/src/tests/sdk_util_test/example.dsc
@@ -11,7 +11,17 @@
'string_util_test.cc',
],
'DEPS': ['ppapi_simple_cpp', 'sdk_util', 'nacl_io'],
- 'LIBS': ['ppapi_simple_cpp', 'ppapi_cpp', 'gmock', 'nacl_io', 'ppapi', 'gtest', 'pthread'],
+ 'LIBS': ['ppapi_simple_cpp', 'ppapi_cpp', 'nacl_io', 'ppapi', 'pthread'],
+ 'INCLUDES': [
+ '../../src/gtest/include',
+ '../../src/gtest',
+ '../../src/gmock/include',
+ '../../src/gmock'
+ ],
+ 'EXTRA_SOURCES' : [
+ '../../src/gtest/src/gtest-all.cc',
+ '../../src/gmock/src/gmock-all.cc'
+ ],
'CXXFLAGS': ['-Wno-sign-compare']
}
],
« no previous file with comments | « native_client_sdk/src/tests/nacl_io_test/example.dsc ('k') | native_client_sdk/src/tools/common.mk » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698