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

Unified Diff: trunk/src/testing/gtest_nacl.gyp

Issue 466303002: Revert 289216 "Create NaCl build of gtest." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 | « trunk/src/testing/gtest.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/testing/gtest_nacl.gyp
===================================================================
--- trunk/src/testing/gtest_nacl.gyp (revision 289220)
+++ trunk/src/testing/gtest_nacl.gyp (working copy)
@@ -1,92 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
- 'variables': {
- 'chromium_code': 1,
- },
- 'includes': [
- '../build/common_untrusted.gypi',
- 'gtest.gypi',
- ],
- 'conditions': [
- ['disable_nacl==0 and disable_nacl_untrusted==0', {
- 'targets': [
- {
- 'target_name': 'gtest_nacl',
- 'type': 'none',
- 'variables': {
- 'nlib_target': 'libgtest_nacl.a',
- 'build_glibc': 0,
- 'build_newlib': 1,
- 'build_pnacl_newlib': 0,
- },
- 'sources': [
- '<@(gtest_sources)',
- ],
- 'include_dirs': [
- 'gtest',
- 'gtest/include',
- ],
- 'defines': [
- # In order to allow regex matches in gtest to be shared between
- # Windows and other systems, we tell gtest to always use it's
- # internal engine.
- 'GTEST_HAS_POSIX_RE=0',
- 'GTEST_LANG_CXX11=0',
- ],
- 'all_dependent_settings': {
- 'defines': [
- 'GTEST_HAS_POSIX_RE=0',
- 'GTEST_LANG_CXX11=0',
- ],
- 'link_flags': [
- '-lgtest_nacl',
- ],
- },
- 'defines': [
- # gtest isn't able to figure out when RTTI is disabled for gcc
- # versions older than 4.3.2, and assumes it's enabled. Our Mac
- # and Linux builds disable RTTI, and cannot guarantee that the
- # compiler will be 4.3.2. or newer. The Mac, for example, uses
- # 4.2.1 as that is the latest available on that platform. gtest
- # must be instructed that RTTI is disabled here, and for any
- # direct dependents that might include gtest headers.
- 'GTEST_HAS_RTTI=0',
- ],
- 'direct_dependent_settings': {
- 'defines': [
- 'UNIT_TEST',
- 'GTEST_HAS_RTTI=0',
- ],
- 'include_dirs': [
- 'gtest/include', # So that gtest headers can find themselves.
- ],
- },
- },
- {
- 'target_name': 'gtest_main_nacl',
- 'type': 'none',
- 'variables': {
- 'nlib_target': 'libgtest_main_nacl.a',
- 'build_glibc': 0,
- 'build_newlib': 1,
- 'build_pnacl_newlib': 0,
- },
- 'dependencies': [
- 'gtest_nacl',
- ],
- 'sources': [
- 'gtest/src/gtest_main.cc',
- ],
- 'all_dependent_settings': {
- 'link_flags': [
- '-lgtest_main_nacl',
- ],
- },
- },
- ],
- }],
- ],
-}
« no previous file with comments | « trunk/src/testing/gtest.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698