diff options
Diffstat (limited to 'chromium/native_client/src/shared/imc/imc.gyp')
| -rw-r--r-- | chromium/native_client/src/shared/imc/imc.gyp | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/chromium/native_client/src/shared/imc/imc.gyp b/chromium/native_client/src/shared/imc/imc.gyp index de1b31fefab..68fca8b4a9a 100644 --- a/chromium/native_client/src/shared/imc/imc.gyp +++ b/chromium/native_client/src/shared/imc/imc.gyp @@ -12,7 +12,7 @@ 'nacl_imc_c.h', ], 'conditions': [ - ['OS=="linux"', { + ['OS=="linux" or OS=="android"', { 'common_sources': [ 'linux/nacl_imc.cc', 'posix/nacl_imc_posix.cc', @@ -67,27 +67,23 @@ '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio', ], }, + { + 'target_name': 'imc_lib', + 'type': 'none', + 'variables': { + 'nlib_target': 'libimc.a', + 'nso_target': 'libimc.so', + 'build_glibc': 1, + 'build_newlib': 1, + 'build_pnacl_newlib': 1, + 'sources': ['nacl_imc_common.cc', 'nacl/nacl_imc.cc'], + }, + 'dependencies': [ + '<(DEPTH)/native_client/tools.gyp:prep_toolchain', + ], + }, ], 'conditions': [ - ['target_arch!="arm"', { - 'targets': [ - # NOTE: we do not support untrusted gyp build on arm yet. - { - 'target_name': 'imc_lib', - 'type': 'none', - 'variables': { - 'nlib_target': 'libimc.a', - 'nso_target': 'libimc.so', - 'build_glibc': 1, - 'build_newlib': 1, - 'sources': ['nacl_imc_common.cc', 'nacl/nacl_imc.cc'], - }, - 'dependencies': [ - '<(DEPTH)/native_client/tools.gyp:prep_toolchain', - ], - }, - ], - }], ['OS=="win" and target_arch=="ia32"', { 'targets': [ # --------------------------------------------------------------------- |