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

Unified Diff: build/common_untrusted.gypi

Issue 10912011: Change NaCl IPC PPAPI proxy startup to support a NaCl-Browser process (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | « no previous file | chrome/browser/nacl_host/nacl_process_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common_untrusted.gypi
===================================================================
--- build/common_untrusted.gypi (revision 154143)
+++ build/common_untrusted.gypi (working copy)
@@ -9,26 +9,21 @@
'../native_client/build/untrusted.gypi',
],
'target_defaults': {
- 'variables': {
- 'conditions': [
- ['target_arch=="arm"', {
+ 'conditions': [
+ ['target_arch=="arm"', {
+ 'variables': {
'clang': 1,
- 'defines': [
- # Needed by build/build_config.h processor architecture detection.
- '__ARMEL__',
- # Needed by base/third_party/nspr/prtime.cc.
- '__arm__',
- # Disable ValGrind. The assembly code it generates causes the build
- # to fail.
- 'NVALGRIND',
- ],
- 'compile_flags': [
- # Disable C++ 11 extensions. Chrome's OVERRIDE macro will generate
- # warnings that cause the build to fail.
- '-Wno-c++11-extensions',
- ],
- }],
- ],
- },
+ },
+ 'defines': [
+ # Needed by build/build_config.h processor architecture detection.
+ '__ARMEL__',
+ # Needed by base/third_party/nspr/prtime.cc.
+ '__arm__',
+ # Disable ValGrind. The assembly code it generates causes the build
+ # to fail.
+ 'NVALGRIND',
+ ],
+ }],
+ ],
},
}
« no previous file with comments | « no previous file | chrome/browser/nacl_host/nacl_process_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698