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

Unified Diff: build/nacl_core_sdk.gyp

Issue 93513013: Add gyp build of sel_ldr and irt_core for ARM (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Created 6 years, 11 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/nacl_core_sdk.gyp
diff --git a/build/nacl_core_sdk.gyp b/build/nacl_core_sdk.gyp
index 5c5c5ea97afc750d0589a462ac6954de194f6cc3..84cc1452b62e7119ba5207ee3274c79aef93ddcb 100644
--- a/build/nacl_core_sdk.gyp
+++ b/build/nacl_core_sdk.gyp
@@ -11,6 +11,7 @@
'target_name': 'nacl_core_sdk',
'type': 'none',
'dependencies': [
+ '../src/untrusted/irt/irt.gyp:irt_core_nexe',
'../src/untrusted/minidump_generator/minidump_generator.gyp:minidump_generator_lib',
'../src/untrusted/nacl/nacl.gyp:nacl_dynacode_lib',
'../src/untrusted/nacl/nacl.gyp:nacl_exception_lib',
@@ -20,12 +21,14 @@
'../src/untrusted/pthread/pthread.gyp:pthread_lib',
],
'conditions': [
- ['target_arch!="arm" and target_arch!="mipsel"', {
+ ['(target_arch!="arm" and target_arch!="mipsel") or OS=="linux"', {
+ # sel_ldr is not buildable for arm, except on linux.
'dependencies': [
- # sel_ldr and irt are host-only and not needed when building the
- # arm and mips components of the SDK.
- '../src/untrusted/irt/irt.gyp:irt_core_nexe',
'../src/trusted/service_runtime/service_runtime.gyp:sel_ldr',
+ ],
+ }],
+ ['target_arch!="arm" and target_arch!="mipsel"', {
+ 'dependencies': [
# these libraries don't currently exist on arm and mips
'../src/untrusted/valgrind/valgrind.gyp:dynamic_annotations_lib',
'../src/untrusted/valgrind/valgrind.gyp:valgrind_lib',
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698