diff options
Diffstat (limited to 'chromium/native_client/src/shared/platform/platform.gyp')
| -rw-r--r-- | chromium/native_client/src/shared/platform/platform.gyp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chromium/native_client/src/shared/platform/platform.gyp b/chromium/native_client/src/shared/platform/platform.gyp index e8d21df075a..4303462ee71 100644 --- a/chromium/native_client/src/shared/platform/platform.gyp +++ b/chromium/native_client/src/shared/platform/platform.gyp @@ -36,7 +36,7 @@ 'refcount_base.cc', ], 'conditions': [ - ['OS=="linux"', { + ['OS=="linux" or OS=="android"', { 'platform_sources': [ 'linux/nacl_clock.c', 'linux/nacl_host_dir.c', @@ -51,7 +51,7 @@ 'osx/strnlen_osx.c', ], }], - ['OS=="linux" or OS=="mac"', { + ['os_posix==1', { 'platform_sources': [ 'posix/aligned_malloc.c', 'posix/condition_variable.c', @@ -103,7 +103,7 @@ 'target_base': 'none', }, 'target_conditions': [ - ['OS=="linux" or OS=="mac"', { + ['<(os_posix)==1', { 'cflags': [ '-Wno-long-long', ], @@ -134,6 +134,8 @@ { 'target_name': 'platform', 'type': 'static_library', + # tls_edit relies on this which is always built for the host platform. + 'toolsets': ['host', 'target'], 'variables': { 'target_base': 'platform_lib', }, |