| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 # This GYP file should be included for every target in Chromium that is built | 5 # This GYP file should be included for every target in Chromium that is built |
| 6 # using the NaCl toolchain. | 6 # using the NaCl toolchain. |
| 7 { | 7 { |
| 8 'includes': [ | 8 'includes': [ |
| 9 '../native_client/build/untrusted.gypi', | 9 '../native_client/build/untrusted.gypi', |
| 10 ], | 10 ], |
| 11 'target_defaults': { | 11 'target_defaults': { |
| 12 'variables': { | 12 'conditions': [ |
| 13 'conditions': [ | 13 ['target_arch=="arm"', { |
| 14 ['target_arch=="arm"', { | 14 'variables': { |
| 15 'clang': 1, | 15 'clang': 1, |
| 16 'defines': [ | 16 }, |
| 17 # Needed by build/build_config.h processor architecture detection. | 17 'defines': [ |
| 18 '__ARMEL__', | 18 # Needed by build/build_config.h processor architecture detection. |
| 19 # Needed by base/third_party/nspr/prtime.cc. | 19 '__ARMEL__', |
| 20 '__arm__', | 20 # Needed by base/third_party/nspr/prtime.cc. |
| 21 # Disable ValGrind. The assembly code it generates causes the build | 21 '__arm__', |
| 22 # to fail. | 22 # Disable ValGrind. The assembly code it generates causes the build |
| 23 'NVALGRIND', | 23 # to fail. |
| 24 ], | 24 'NVALGRIND', |
| 25 'compile_flags': [ | 25 ], |
| 26 # Disable C++ 11 extensions. Chrome's OVERRIDE macro will generate | 26 }], |
| 27 # warnings that cause the build to fail. | 27 ], |
| 28 '-Wno-c++11-extensions', | |
| 29 ], | |
| 30 }], | |
| 31 ], | |
| 32 }, | |
| 33 }, | 28 }, |
| 34 } | 29 } |
| OLD | NEW |