diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-24 04:44:41 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-24 04:44:41 +0000 |
| commit | c691139a2747f30575b6728bfd082f1b7397d6f4 (patch) | |
| tree | 92a711a68d62b69cd7e3f70a815f71c00a922537 /build/common.gypi | |
| parent | 938326a8288ce244dc27ce480c285c2941a9d0c5 (diff) | |
| download | chromium_src-c691139a2747f30575b6728bfd082f1b7397d6f4.zip chromium_src-c691139a2747f30575b6728bfd082f1b7397d6f4.tar.gz chromium_src-c691139a2747f30575b6728bfd082f1b7397d6f4.tar.bz2 | |
Revert 128679 - Speculative revert. xcodebuilders hosed between r128678 - 128680 in GYP phse, this is the only change that touched GYP files.
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
TBR=jrg@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9852004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128685 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/build/common.gypi b/build/common.gypi index f3f908a..c90d15b 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -789,9 +789,9 @@ 'notifications%': 0, # Builds the gtest targets as a shared_library. - # 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', + # TODO(michaelbai): Use the fixed value 'shared_library' once it + # is fully supported. + 'gtest_target_type%': '<(gtest_target_type)', # Uses system APIs for decoding audio and video. 'use_libffmpeg%': '0', @@ -2356,11 +2356,6 @@ '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' ], }], ], }], |