Skip to content

Commit

Permalink
Revert 289216 "Create NaCl build of gtest."
Browse files Browse the repository at this point in the history
> Create NaCl build of gtest.
> 
> BUG=401761
> 
> Review URL: https://codereview.chromium.org/401453002

TBR=ncbray@chromium.org

Review URL: https://codereview.chromium.org/466303002

Cr-Commit-Position: refs/heads/master@{#289223}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289223 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
joaodasilva@chromium.org committed Aug 13, 2014
1 parent 4e253fc commit 5409770
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 142 deletions.
5 changes: 0 additions & 5 deletions build/all.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -409,11 +409,6 @@
'../components/nacl.gyp:nacl_loader_unittests',
],
}],
['disable_nacl==0 and disable_nacl_untrusted==0', {
'dependencies': [
'../testing/gtest_nacl.gyp:*',
],
}],
],
}, # target_name: chromium_builder_tests
],
Expand Down
38 changes: 34 additions & 4 deletions testing/gtest.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,46 @@
# found in the LICENSE file.

{
'includes': [
'gtest.gypi',
],
'targets': [
{
'target_name': 'gtest',
'toolsets': ['host', 'target'],
'type': 'static_library',
'sources': [
'<@(gtest_sources)',
'gtest/include/gtest/gtest-death-test.h',
'gtest/include/gtest/gtest-message.h',
'gtest/include/gtest/gtest-param-test.h',
'gtest/include/gtest/gtest-printers.h',
'gtest/include/gtest/gtest-spi.h',
'gtest/include/gtest/gtest-test-part.h',
'gtest/include/gtest/gtest-typed-test.h',
'gtest/include/gtest/gtest.h',
'gtest/include/gtest/gtest_pred_impl.h',
'gtest/include/gtest/internal/gtest-death-test-internal.h',
'gtest/include/gtest/internal/gtest-filepath.h',
'gtest/include/gtest/internal/gtest-internal.h',
'gtest/include/gtest/internal/gtest-linked_ptr.h',
'gtest/include/gtest/internal/gtest-param-util-generated.h',
'gtest/include/gtest/internal/gtest-param-util.h',
'gtest/include/gtest/internal/gtest-port.h',
'gtest/include/gtest/internal/gtest-string.h',
'gtest/include/gtest/internal/gtest-tuple.h',
'gtest/include/gtest/internal/gtest-type-util.h',
'gtest/src/gtest-all.cc',
'gtest/src/gtest-death-test.cc',
'gtest/src/gtest-filepath.cc',
'gtest/src/gtest-internal-inl.h',
'gtest/src/gtest-port.cc',
'gtest/src/gtest-printers.cc',
'gtest/src/gtest-test-part.cc',
'gtest/src/gtest-typed-test.cc',
'gtest/src/gtest.cc',
'multiprocess_func_list.cc',
'multiprocess_func_list.h',
'platform_test.h',
],
'sources!': [
'gtest/src/gtest-all.cc', # Not needed by our build.
],
'include_dirs': [
'gtest',
Expand Down
41 changes: 0 additions & 41 deletions testing/gtest.gypi

This file was deleted.

92 changes: 0 additions & 92 deletions testing/gtest_nacl.gyp

This file was deleted.

0 comments on commit 5409770

Please sign in to comment.