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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tools.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
« no previous file with comments | « src/untrusted/pthread/pthread.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools.gyp
===================================================================
--- tools.gyp (revision 8118)
+++ tools.gyp (working copy)
@@ -8,116 +8,115 @@
'build/common.gypi',
],
######################################################################
- 'conditions': [
- ['target_arch!="arm"', {
- 'targets' : [
+ 'targets' : [
+ {
+ 'target_name': 'prep_toolchain',
+ 'type': 'none',
+ 'conditions': [
+ ['target_arch=="ia32"', {
+ 'dependencies': [
+ 'crt_init_32',
+ 'crt_fini_32',
+ ],
+ }],
+ ['target_arch=="x64" or OS=="win"', {
+ 'dependencies': [
+ 'crt_init_64',
+ 'crt_fini_64',
+ ],
+ }],
+ ],
+ },
+ {
+ 'target_name': 'copy_headers',
+ 'type': 'none',
+ 'actions': [
{
- 'target_name': 'prep_toolchain',
- 'type': 'none',
- 'conditions': [
- ['target_arch=="ia32"', {
- 'dependencies': [
- 'crt_init_32',
- 'crt_fini_32',
- ],
- }],
- ['target_arch=="x64" or OS=="win"', {
- 'dependencies': [
- 'crt_init_64',
- 'crt_fini_64',
- ],
- }],
+ 'action_name': 'Install crt1.o 32',
+ 'msvs_cygwin_shell': 0,
+ 'description': 'Install crt1.o 32',
+ 'inputs': [
+ 'src/untrusted/stubs/crt1.x',
],
+ 'outputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/32/crt1.o',
+ ],
+ 'action': [
+ '>(python_exe)',
+ '<(DEPTH)/native_client/build/copy_sources.py',
+ 'src/untrusted/stubs/crt1.x',
+ '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/32/crt1.o',
+ ],
},
{
- 'target_name': 'copy_headers',
- 'type': 'none',
- 'actions': [
- {
- 'action_name': 'Install crt1.o 32',
- 'msvs_cygwin_shell': 0,
- 'description': 'Install crt1.o 32',
- 'inputs': [
- 'src/untrusted/stubs/crt1.x',
- ],
- 'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/32/crt1.o',
- ],
- 'action': [
- '>(python_exe)',
- '<(DEPTH)/native_client/build/copy_sources.py',
- 'src/untrusted/stubs/crt1.x',
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/32/crt1.o',
- ],
- },
- {
- 'action_name': 'Install crt1.o 64',
- 'msvs_cygwin_shell': 0,
- 'description': 'Install crt1.o 64',
- 'inputs': [
- 'src/untrusted/stubs/crt1.x',
- ],
- 'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/crt1.o',
- ],
- 'action': [
- '>(python_exe)',
- '<(DEPTH)/native_client/build/copy_sources.py',
- 'src/untrusted/stubs/crt1.x',
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/crt1.o',
- ],
- },
+ 'action_name': 'Install crt1.o 64',
+ 'msvs_cygwin_shell': 0,
+ 'description': 'Install crt1.o 64',
+ 'inputs': [
+ 'src/untrusted/stubs/crt1.x',
],
- 'copies': [
- # NEWLIB copies
- {
- 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/include/nacl',
- # Alphabetical order in dst dir for easier verification.
- 'files': [
- '<(DEPTH)/native_client/src/trusted/weak_ref/call_on_main_thread.h',
- '<(DEPTH)/native_client/src/shared/platform/nacl_check.h',
- '<(DEPTH)/native_client/src/untrusted/nacl//nacl_dyncode.h',
- '<(DEPTH)/native_client/src/untrusted/ppapi/nacl_file.h',
- '<(DEPTH)/native_client/src/shared/imc/nacl_imc_c.h',
- '<(DEPTH)/native_client/src/shared/imc/nacl_imc.h',
- '<(DEPTH)/native_client/src/include/nacl/nacl_inttypes.h',
- '<(DEPTH)/native_client/src/shared/platform/nacl_log.h',
- '<(DEPTH)/native_client/src/shared/srpc/nacl_srpc.h',
- '<(DEPTH)/native_client/src/shared/platform/nacl_threads.h',
- '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h',
- '<(DEPTH)/native_client/src/shared/platform/refcount_base.h',
- '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.h'
- ],
- },
- {
- 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/include',
- 'files': [
- '<(DEPTH)/native_client/src/untrusted/pthread/pthread.h',
- '<(DEPTH)/native_client/src/untrusted/pthread/semaphore.h'
- ],
- },
- # GLIBC copies
- {
- # Alphabetical order in dst dir for easier verification.
- 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/include/nacl',
- 'files': [
- '<(DEPTH)/native_client/src/trusted/weak_ref/call_on_main_thread.h',
- '<(DEPTH)/native_client/src/shared/platform/nacl_check.h',
- '<(DEPTH)/native_client/src/untrusted/ppapi/nacl_file.h',
- '<(DEPTH)/native_client/src/shared/imc/nacl_imc.h',
- '<(DEPTH)/native_client/src/include/nacl/nacl_inttypes.h',
- '<(DEPTH)/native_client/src/shared/platform/nacl_log.h',
- '<(DEPTH)/native_client/src/shared/srpc/nacl_srpc.h',
- '<(DEPTH)/native_client/src/shared/platform/nacl_threads.h',
- '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h',
- '<(DEPTH)/native_client/src/shared/platform/refcount_base.h',
- '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.h'
- ],
- },
+ 'outputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/crt1.o',
],
+ 'action': [
+ '>(python_exe)',
+ '<(DEPTH)/native_client/build/copy_sources.py',
+ 'src/untrusted/stubs/crt1.x',
+ '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/crt1.o',
+ ],
},
],
- }],
+ 'copies': [
+ # NEWLIB copies
+ {
+ 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/include/nacl',
+ # Alphabetical order in dst dir for easier verification.
+ 'files': [
+ '<(DEPTH)/native_client/src/trusted/weak_ref/call_on_main_thread.h',
+ '<(DEPTH)/native_client/src/shared/platform/nacl_check.h',
+ '<(DEPTH)/native_client/src/untrusted/nacl/nacl_dyncode.h',
+ '<(DEPTH)/native_client/src/untrusted/ppapi/nacl_file.h',
+ '<(DEPTH)/native_client/src/shared/imc/nacl_imc_c.h',
+ '<(DEPTH)/native_client/src/shared/imc/nacl_imc.h',
+ '<(DEPTH)/native_client/src/include/nacl/nacl_inttypes.h',
+ '<(DEPTH)/native_client/src/shared/platform/nacl_log.h',
+ '<(DEPTH)/native_client/src/shared/srpc/nacl_srpc.h',
+ '<(DEPTH)/native_client/src/shared/platform/nacl_threads.h',
+ '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h',
+ '<(DEPTH)/native_client/src/shared/platform/refcount_base.h',
+ '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.h'
+ ],
+ },
+ {
+ 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/include',
+ 'files': [
+ '<(DEPTH)/native_client/src/untrusted/pthread/pthread.h',
+ '<(DEPTH)/native_client/src/untrusted/pthread/semaphore.h'
+ ],
+ },
+ # GLIBC copies
+ {
+ # Alphabetical order in dst dir for easier verification.
+ 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/include/nacl',
+ 'files': [
+ '<(DEPTH)/native_client/src/trusted/weak_ref/call_on_main_thread.h',
+ '<(DEPTH)/native_client/src/shared/platform/nacl_check.h',
+ '<(DEPTH)/native_client/src/untrusted/ppapi/nacl_file.h',
+ '<(DEPTH)/native_client/src/shared/imc/nacl_imc.h',
+ '<(DEPTH)/native_client/src/include/nacl/nacl_inttypes.h',
+ '<(DEPTH)/native_client/src/shared/platform/nacl_log.h',
+ '<(DEPTH)/native_client/src/shared/srpc/nacl_srpc.h',
+ '<(DEPTH)/native_client/src/shared/platform/nacl_threads.h',
+ '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h',
+ '<(DEPTH)/native_client/src/shared/platform/refcount_base.h',
+ '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.h'
+ ],
+ },
+ ],
+ },
+ ],
+
+ 'conditions': [
['target_arch=="x64" or OS=="win"', {
'targets' : [
{
@@ -125,7 +124,7 @@
'type': 'none',
'dependencies': [
'copy_headers'
- ],
+ ],
'variables': {
'nlib_target': 'crt_init_dummy',
'build_glibc': 0,
@@ -140,7 +139,7 @@
'objdir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64',
'sources': [
'src/untrusted/stubs/crti_x86_64.S',
- ]
+ ]
},
},
{
@@ -148,7 +147,7 @@
'type': 'none',
'dependencies': [
'copy_headers'
- ],
+ ],
'variables': {
'nlib_target': 'crt_fini_dummy',
'build_glibc': 0,
@@ -163,7 +162,7 @@
'objdir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64',
'sources': [
'src/untrusted/stubs/crtn_x86_64.S'
- ]
+ ]
},
}
],
@@ -175,7 +174,7 @@
'type': 'none',
'dependencies': [
'copy_headers'
- ],
+ ],
'variables': {
'nlib_target': 'crt_init_dummy',
'build_glibc': 0,
@@ -198,7 +197,7 @@
'type': 'none',
'dependencies': [
'copy_headers'
- ],
+ ],
'variables': {
'nlib_target': 'crt_fini_dummy',
'build_glibc': 0,
« no previous file with comments | « src/untrusted/pthread/pthread.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698