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: http://src.chromium.org/svn/trunk/src/build@132154 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

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',
       ],
     },

common.gypi

@@ -846,6 +846,12 @@
         # Use the system icu.
         'use_system_icu%': 0,
 
+        # TODO(yfriedman): Remove once unit_tests can link for Android.
+        # To override it specify:
+        # GYP_DEFINES="$GYP_DEFINES android_unit_test_target_type=executable"
+        #     android_gyp
+        'android_unit_test_target_type%': 'static_library',
+
         # Choose static link by build type.
         'conditions': [
           ['android_build_type==0', {