| Index: base/base.gypi
|
| diff --git a/base/base.gypi b/base/base.gypi
|
| index 3d304a358d01b7e2afc6e968777be184ac20333c..7d1a1c7c5f90dafac4135e56156889c8816150ab 100644
|
| --- a/base/base.gypi
|
| +++ b/base/base.gypi
|
| @@ -451,6 +451,7 @@
|
| 'sources/': [
|
| ['include', '^process_util_linux\\.cc$'],
|
| ['include', '^sys_info_linux\\.cc$'],
|
| + ['include', '^sys_string_conversions_posix\\.cc$'],
|
| ['include', '^worker_pool_linux\\.cc$'],
|
| # TODO(michaelbai): The below files are excluded because of the
|
| # missing JNI, add them back when JNI is ready.
|
| @@ -598,36 +599,54 @@
|
| ['exclude', '_nss\.cc$'],
|
| ],
|
| }],
|
| - [ 'OS == "android"', {
|
| - 'dependencies': [
|
| - 'symbolize',
|
| - '../third_party/ashmem/ashmem.gyp:ashmem#target',
|
| - ],
|
| - 'defines': [
|
| - 'USE_SYMBOLIZE',
|
| - ],
|
| + [ 'OS == "android" and _toolset == "host"', {
|
| + # Base for host support is the minimum required to run the
|
| + # ssl false start blacklist tool. It requires further changes
|
| + # to generically support host builds (and tests).
|
| + # Note: when building for host, gyp has OS == "android",
|
| + # hence the *_android.cc files are included but the actual code
|
| + # doesn't have OS_ANDROID / ANDROID defined.
|
| 'conditions': [
|
| - [ '_toolset=="host" and host_os=="linux"', {
|
| + ['host_os == "linux"', {
|
| + 'sources/': [
|
| + ['include', '^atomicops_internals_x86_gcc\\.cc$'],
|
| + ],
|
| 'dependencies': [
|
| '../build/linux/system.gyp:glib',
|
| ],
|
| - 'sources/': [
|
| - ['include', '^atomicops_internals_x86_gcc\\.cc$'],
|
| + 'export_dependent_settings': [
|
| + '../build/linux/system.gyp:glib',
|
| ],
|
| }],
|
| - [ '_toolset=="target"', {
|
| - 'sources!': [
|
| - 'debug/stack_trace.cc',
|
| - 'debug/stack_trace_posix.cc',
|
| + ['host_os == "mac"', {
|
| + 'sources/': [
|
| + ['exclude', '^native_library_linux\\.cc$'],
|
| + ['exclude', '^process_util_linux\\.cc$'],
|
| + ['exclude', '^sys_info_linux\\.cc$'],
|
| + ['exclude', '^sys_string_conversions_linux\\.cc$'],
|
| + ['exclude', '^worker_pool_linux\\.cc$'],
|
| ],
|
| - 'link_settings': {
|
| - 'libraries': [
|
| - '-llog',
|
| - ],
|
| - },
|
| }],
|
| ],
|
| }],
|
| + [ 'OS == "android" and _toolset == "target"', {
|
| + 'dependencies': [
|
| + 'symbolize',
|
| + '../third_party/ashmem/ashmem.gyp:ashmem',
|
| + ],
|
| + 'link_settings': {
|
| + 'libraries': [
|
| + '-llog',
|
| + ],
|
| + },
|
| + 'defines': [
|
| + 'USE_SYMBOLIZE',
|
| + ],
|
| + 'sources!': [
|
| + 'debug/stack_trace.cc',
|
| + 'debug/stack_trace_posix.cc',
|
| + ],
|
| + }],
|
| [ 'os_bsd==1', {
|
| 'include_dirs': [
|
| '/usr/local/include',
|
|
|