diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 20:35:54 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 20:35:54 +0000 |
| commit | 08be8a78fdca57d62b5b3a942a17e414af091fca (patch) | |
| tree | 52d7af05b2d320608970b96356483598239f62fe | |
| parent | 5eb4265b79482c18912fa9afce49d99030450ce5 (diff) | |
| download | chromium_src-08be8a78fdca57d62b5b3a942a17e414af091fca.zip chromium_src-08be8a78fdca57d62b5b3a942a17e414af091fca.tar.gz chromium_src-08be8a78fdca57d62b5b3a942a17e414af091fca.tar.bz2 | |
test_shell buildable on ARM
GYP changes to allow test_shell be buildable on ARM so we can
use it as a minimal browser for testing purpopse.
Review URL: http://codereview.chromium.org/399077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32386 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.gypi | 4 | ||||
| -rw-r--r-- | chrome/test/interactive_ui/interactive_ui_tests.gypi | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/build/common.gypi b/build/common.gypi index 01136dc..8163dd0 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -725,8 +725,8 @@ # flag. 'cflags!': [ '-fvisibility=hidden' ], 'conditions': [ - ['target_arch=="x64"', { - # Shared libraries need -fPIC on x86-64 + ['target_arch=="x64" or target_arch=="arm"', { + # Shared libraries need -fPIC on x86-64 and arm 'cflags': ['-fPIC'] }] ], diff --git a/chrome/test/interactive_ui/interactive_ui_tests.gypi b/chrome/test/interactive_ui/interactive_ui_tests.gypi index 7f0838c..75934b3 100644 --- a/chrome/test/interactive_ui/interactive_ui_tests.gypi +++ b/chrome/test/interactive_ui/interactive_ui_tests.gypi @@ -63,7 +63,7 @@ '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h', ], }], # OS=="linux" - ['target_arch!="x64"', { + ['target_arch!="x64" and target_arch!="arm"', { 'dependencies': [ # run time dependency '<(DEPTH)/webkit/tools/test_shell/test_shell.gyp:npapi_test_plugin', diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index f805b09..78a0d2c 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -123,7 +123,7 @@ ], 'conditions': [ # http://code.google.com/p/chromium/issues/detail?id=18337 - ['target_arch!="x64"', { + ['target_arch!="x64" and target_arch!="arm"', { 'dependencies': [ 'npapi_test_plugin', ], @@ -545,7 +545,7 @@ }, ], 'conditions': [ - ['target_arch!="x64"', { + ['target_arch!="x64" and target_arch!="arm"', { 'targets': [ { 'target_name': 'npapi_test_plugin', @@ -634,7 +634,7 @@ ], }, }], - ['OS=="linux" and target_arch=="x64"', { + ['OS=="linux" and (target_arch=="x64" or target_arch=="arm")', { # Shared libraries need -fPIC on x86-64 'cflags': ['-fPIC'] }], |