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 /base/base.gyp | |
| 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 'base/base.gyp')
| -rw-r--r-- | base/base.gyp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/base/base.gyp b/base/base.gyp index 08461d7..ee44677 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -9,6 +9,7 @@ 'includes': [ '../build/win_precompile.gypi', 'base.gypi', + 'test/android/native_test.gyp' ], 'targets': [ { @@ -153,7 +154,7 @@ }, { 'target_name': 'base_unittests', - 'type': 'executable', + 'type': '<(gtest_target_type)', 'sources': [ # Tests. 'android/jni_android_unittest.cc', |