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 @@
'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,34 +599,52 @@
['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',
],
'export_dependent_settings': [
'../build/linux/system.gyp:glib',
],
}],
['host_os == "mac"', {
'sources/': [
['include', '^atomicops_internals_x86_gcc\\.cc$'],
['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$'],
],
}],
[ '_toolset=="target"', {
'sources!': [
'debug/stack_trace.cc',
'debug/stack_trace_posix.cc',
],
}],
[ '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', {
......
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