diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-24 03:57:36 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-24 03:57:36 +0000 |
| commit | 9713fa838364257affc9e863a4f842f044fa0c20 (patch) | |
| tree | 9b80df03f33c22e2fae2eecc7051a7ac1ddffbad /build/common.gypi | |
| parent | 27cc5a09bba00e877f8815d592d0ba955f62002b (diff) | |
| download | chromium_src-9713fa838364257affc9e863a4f842f044fa0c20.zip chromium_src-9713fa838364257affc9e863a4f842f044fa0c20.tar.gz chromium_src-9713fa838364257affc9e863a4f842f044fa0c20.tar.bz2 | |
apk-based test runner work. Not enabled yet. This CL is a combination of upstreaming, ndk/ant-ification, and other tweaks.
BUG=None
TEST=
Review URL: http://codereview.chromium.org/9834037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128679 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi index c90d15b..f3f908a 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -789,9 +789,9 @@ 'notifications%': 0, # Builds the gtest targets as a shared_library. - # TODO(michaelbai): Use the fixed value 'shared_library' once it - # is fully supported. - 'gtest_target_type%': '<(gtest_target_type)', + # TODO(jrg): when 'gtest_target_type'=='shared_libary' and OS==android, + # make all gtest_targets depend on base/base.gyp:native_test_apk. + ### 'gtest_target_type': 'shared_libary', # Uses system APIs for decoding audio and video. 'use_libffmpeg%': '0', @@ -2356,6 +2356,11 @@ 'ldflags': [ '-Wl,-shared,-Bsymbolic', ], + # Use of -nostdlib prevents the compiler from bringing + # in crtbegin_dynamic.o et al, so we get an undefined + # reference to ___dso_handle when building + # gtest_target_type==shared_library. + 'ldflags!': [ '-nostdlib' ], }], ], }], |