Commit 5a937a8c authored by bulach@chromium.org's avatar bulach@chromium.org

Allows base to be built for host on android.

ssl_false_start_blacklist_process needs to be built and executed in the host environment.

This was introduced by r95907.

BUG=
TEST=


Review URL: http://codereview.chromium.org/8586054

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111158 0039d316-1c4b-4281-b951-d872f2087c98
parent e27ef7f5
...@@ -451,6 +451,7 @@ ...@@ -451,6 +451,7 @@
'sources/': [ 'sources/': [
['include', '^process_util_linux\\.cc$'], ['include', '^process_util_linux\\.cc$'],
['include', '^sys_info_linux\\.cc$'], ['include', '^sys_info_linux\\.cc$'],
['include', '^sys_string_conversions_posix\\.cc$'],
['include', '^worker_pool_linux\\.cc$'], ['include', '^worker_pool_linux\\.cc$'],
# TODO(michaelbai): The below files are excluded because of the # TODO(michaelbai): The below files are excluded because of the
# missing JNI, add them back when JNI is ready. # missing JNI, add them back when JNI is ready.
...@@ -598,36 +599,54 @@ ...@@ -598,36 +599,54 @@
['exclude', '_nss\.cc$'], ['exclude', '_nss\.cc$'],
], ],
}], }],
[ 'OS == "android"', { [ 'OS == "android" and _toolset == "host"', {
'dependencies': [ # Base for host support is the minimum required to run the
'symbolize', # ssl false start blacklist tool. It requires further changes
'../third_party/ashmem/ashmem.gyp:ashmem#target', # to generically support host builds (and tests).
], # Note: when building for host, gyp has OS == "android",
'defines': [ # hence the *_android.cc files are included but the actual code
'USE_SYMBOLIZE', # doesn't have OS_ANDROID / ANDROID defined.
],
'conditions': [ 'conditions': [
[ '_toolset=="host" and host_os=="linux"', { ['host_os == "linux"', {
'sources/': [
['include', '^atomicops_internals_x86_gcc\\.cc$'],
],
'dependencies': [ 'dependencies': [
'../build/linux/system.gyp:glib', '../build/linux/system.gyp:glib',
], ],
'sources/': [ 'export_dependent_settings': [
['include', '^atomicops_internals_x86_gcc\\.cc$'], '../build/linux/system.gyp:glib',
], ],
}], }],
[ '_toolset=="target"', { ['host_os == "mac"', {
'sources!': [ 'sources/': [
'debug/stack_trace.cc', ['exclude', '^native_library_linux\\.cc$'],
'debug/stack_trace_posix.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', { [ 'os_bsd==1', {
'include_dirs': [ 'include_dirs': [
'/usr/local/include', '/usr/local/include',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment