diff options
| author | sbc <sbc@chromium.org> | 2016-01-07 11:47:05 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-07 19:48:58 +0000 |
| commit | b54fa117fb6e19784a5c80d06bf28073bdb1a01c (patch) | |
| tree | 6d3a3d5b9def1405df2fc25d403bdb8535d58fcd /native_client_sdk/src/examples | |
| parent | 5632bf5e2836df74ca4d92e98c05540d6b4e62f2 (diff) | |
| download | chromium_src-b54fa117fb6e19784a5c80d06bf28073bdb1a01c.zip chromium_src-b54fa117fb6e19784a5c80d06bf28073bdb1a01c.tar.gz chromium_src-b54fa117fb6e19784a5c80d06bf28073bdb1a01c.tar.bz2 | |
[NaCl SDK] Don't include gtest/gmock in library form
These are designed to be built from source into
each project that uses them.
The change also remove gtest/gmock from the default
include path which allows different versions to be
used, for example, in webports.
A corresponding change to webports will be required:
https://codereview.chromium.org/1555913002
Fix host_vc.mk such that it uses SRC_TO_OBJ to derive
object file name (i.e. fix http://crbug/569091).
CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:linux_nacl_sdk;tryserver.chromium.mac:mac_nacl_sdk;tryserver.chromium.win:win_nacl_sdk
BUG=569091
Review URL: https://codereview.chromium.org/1559463002
Cr-Commit-Position: refs/heads/master@{#368128}
Diffstat (limited to 'native_client_sdk/src/examples')
| -rw-r--r-- | native_client_sdk/src/examples/tutorial/testing/example.dsc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/native_client_sdk/src/examples/tutorial/testing/example.dsc b/native_client_sdk/src/examples/tutorial/testing/example.dsc index 284ec46..07f1fbc 100644 --- a/native_client_sdk/src/examples/tutorial/testing/example.dsc +++ b/native_client_sdk/src/examples/tutorial/testing/example.dsc @@ -6,7 +6,9 @@ 'NAME' : 'testing', 'TYPE' : 'main', 'SOURCES' : ['testing.cc'], - 'LIBS' : ['ppapi_simple_cpp', 'ppapi_cpp', 'ppapi', 'gtest', 'nacl_io', 'pthread'], + 'LIBS' : ['ppapi_simple_cpp', 'ppapi_cpp', 'ppapi', 'nacl_io', 'pthread'], + 'INCLUDES': ['../../../src/gtest/include', '../../../src/gtest'], + 'EXTRA_SOURCES' : ['../../../src/gtest/src/gtest-all.cc'], 'CXXFLAGS': ['-Wno-sign-compare'] } ], |