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