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

Unified Diff: src/shared/platform/platform.gyp

Issue 9816003: GYP build for ARM untrusted runtime. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
Patch Set: Created 8 years, 9 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
Index: src/shared/platform/platform.gyp
===================================================================
--- src/shared/platform/platform.gyp (revision 8104)
+++ src/shared/platform/platform.gyp (working copy)
@@ -174,37 +174,33 @@
'<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio',
],
},
- # ----------------------------------------------------------------------
- ],
- 'conditions': [
- # NOTE: we do not support untrusted gyp build on arm yet.
- ['target_arch!="arm"', {
- 'targets': [
- {
- 'target_name': 'platform_lib',
- 'type': 'none',
- 'variables': {
- 'nlib_target': 'libplatform.a',
- 'build_glibc': 1,
- 'build_newlib': 1,
- 'sources': [
- 'nacl_check.c',
- 'nacl_log.c',
- 'linux/condition_variable.c',
- 'linux/lock.c',
- 'linux/nacl_exit.c',
- 'linux/nacl_thread_id.c',
- 'linux/nacl_threads.c',
- 'linux/nacl_timestamp.c',
- 'nacl_sync_checked.c',
- 'refcount_base.cc',
+ {
+ 'target_name': 'platform_lib',
+ 'type': 'none',
+ 'variables': {
+ 'nlib_target': 'libplatform.a',
+ 'build_glibc': 1,
+ 'build_newlib': 1,
+ 'sources': [
+ 'nacl_check.c',
+ 'nacl_log.c',
+ 'linux/condition_variable.c',
+ 'linux/lock.c',
+ 'linux/nacl_exit.c',
+ 'linux/nacl_thread_id.c',
+ 'linux/nacl_threads.c',
+ 'linux/nacl_timestamp.c',
+ 'nacl_sync_checked.c',
+ 'refcount_base.cc',
]
Mark Seaborn 2012/03/28 07:21:02 indent -2; same for other closing brackets below.
Nikolay 2012/03/28 13:24:23 Thanks, seems my beloved editor misused python-mod
},
- 'dependencies': [
- '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+ 'dependencies': [
+ '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
],
- }],
- }],
+ },
+ # ----------------------------------------------------------------------
+ ],
+ 'conditions': [
['OS=="win"', {
'targets': [
# ---------------------------------------------------------------------
@@ -239,4 +235,3 @@
}],
],
}
-

Powered by Google App Engine
This is Rietveld 408576698