summaryrefslogtreecommitdiffstats
path: root/build/all_android.gyp
diff options
context:
space:
mode:
authoryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-13 07:37:15 +0000
committeryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-13 07:37:15 +0000
commit7c3dc4734a15b0abedb08ef9c6f5e96e0f65814a (patch)
tree2fbf2ba8b0439c5f325cd658cd380d967f236f9c /build/all_android.gyp
parent7e39285433ef15bd7f932ea216ee043146620858 (diff)
downloadchromium_src-7c3dc4734a15b0abedb08ef9c6f5e96e0f65814a.zip
chromium_src-7c3dc4734a15b0abedb08ef9c6f5e96e0f65814a.tar.gz
chromium_src-7c3dc4734a15b0abedb08ef9c6f5e96e0f65814a.tar.bz2
Temporarily make unit_tests a static library on Android.
While we sort out the remaining linker errors, this at least ensures we can add compliation of a bunch of chrome code for Android to gatekeeper. This is motivated by having the android unit_tests compilation step broken 4 out of 4 days this week. BUG=117407 Review URL: http://codereview.chromium.org/10065018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132154 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/all_android.gyp')
-rw-r--r--build/all_android.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/all_android.gyp b/build/all_android.gyp
index 50bd204..e38ab29 100644
--- a/build/all_android.gyp
+++ b/build/all_android.gyp
@@ -56,6 +56,7 @@
'target_name': 'android_experimental',
'type': 'none',
'dependencies': [
+ '../chrome/chrome.gyp:unit_tests',
],
},
{
@@ -65,7 +66,6 @@
'type': 'none',
'dependencies': [
'../content/content.gyp:content_browsertests',
- '../chrome/chrome.gyp:unit_tests',
'../ui/ui.gyp:gfx_unittests',
],
},