| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 }, | 8 }, |
| 9 'includes': [ | 9 'includes': [ |
| 10 '../build/common_untrusted.gypi', | 10 '../build/common_untrusted.gypi', |
| 11 'gtest.gypi', | 11 'gtest.gypi', |
| 12 ], | 12 ], |
| 13 'conditions': [ | 13 'conditions': [ |
| 14 ['disable_nacl==0 and disable_nacl_untrusted==0', { | 14 ['disable_nacl==0 and disable_nacl_untrusted==0', { |
| 15 'targets': [ | 15 'targets': [ |
| 16 { | 16 { |
| 17 'target_name': 'gtest_nacl', | 17 'target_name': 'gtest_nacl', |
| 18 'type': 'none', | 18 'type': 'none', |
| 19 'variables': { | 19 'variables': { |
| 20 'nlib_target': 'libgtest_nacl.a', | 20 'nlib_target': 'libgtest_nacl.a', |
| 21 'build_glibc': 0, | 21 'build_glibc': 0, |
| 22 'build_newlib': 0, | 22 'build_newlib': 0, |
| 23 'build_irt': 0, |
| 23 'build_pnacl_newlib': 1, | 24 'build_pnacl_newlib': 1, |
| 25 'build_nonsfi_helper': 1, |
| 24 }, | 26 }, |
| 25 'sources': [ | 27 'sources': [ |
| 26 '<@(gtest_sources)', | 28 '<@(gtest_sources)', |
| 27 ], | 29 ], |
| 28 'include_dirs': [ | 30 'include_dirs': [ |
| 29 'gtest', | 31 'gtest', |
| 30 'gtest/include', | 32 'gtest/include', |
| 31 ], | 33 ], |
| 32 'defines': [ | 34 'defines': [ |
| 33 # In order to allow regex matches in gtest to be shared between | 35 # In order to allow regex matches in gtest to be shared between |
| (...skipping 29 matching lines...) Expand all Loading... |
| 63 ], | 65 ], |
| 64 }, | 66 }, |
| 65 }, | 67 }, |
| 66 { | 68 { |
| 67 'target_name': 'gtest_main_nacl', | 69 'target_name': 'gtest_main_nacl', |
| 68 'type': 'none', | 70 'type': 'none', |
| 69 'variables': { | 71 'variables': { |
| 70 'nlib_target': 'libgtest_main_nacl.a', | 72 'nlib_target': 'libgtest_main_nacl.a', |
| 71 'build_glibc': 0, | 73 'build_glibc': 0, |
| 72 'build_newlib': 0, | 74 'build_newlib': 0, |
| 75 'build_irt': 0, |
| 73 'build_pnacl_newlib': 1, | 76 'build_pnacl_newlib': 1, |
| 77 'build_nonsfi_helper': 1, |
| 74 }, | 78 }, |
| 75 'dependencies': [ | 79 'dependencies': [ |
| 76 'gtest_nacl', | 80 'gtest_nacl', |
| 77 ], | 81 ], |
| 78 'sources': [ | 82 'sources': [ |
| 79 'gtest/src/gtest_main.cc', | 83 'gtest/src/gtest_main.cc', |
| 80 ], | 84 ], |
| 81 'all_dependent_settings': { | 85 'all_dependent_settings': { |
| 82 'link_flags': [ | 86 'link_flags': [ |
| 83 '-lgtest_main_nacl', | 87 '-lgtest_main_nacl', |
| 84 ], | 88 ], |
| 85 }, | 89 }, |
| 86 }, | 90 }, |
| 87 ], | 91 ], |
| 88 }], | 92 }], |
| 89 ], | 93 ], |
| 90 } | 94 } |
| OLD | NEW |