Switch android fyi builder to actually build the "android_experimental" target.

Also updates that target with in process build targets and disables a
failing test.

BUG=113487
TEST=


Review URL: http://codereview.chromium.org/9433007

git-svn-id: http://src.chromium.org/svn/trunk/src/build@122905 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

all_android.gyp

@@ -47,9 +47,8 @@
       'dependencies': [
         '../webkit/webkit.gyp:pull_in_webkit_unit_tests',
         '../webkit/webkit.gyp:pull_in_DumpRenderTree',
-        '../chrome/chrome.gyp:unit_tests',
-        # Requires 64-bit linker.
         '../content/content.gyp:content_unittests',
+        '../chrome/chrome.gyp:browser',
       ],
     },
     {
@@ -60,6 +59,7 @@
       'dependencies': [
         '../content/content.gyp:content_browsertests',
         '../chrome/chrome.gyp:sync_unit_tests',
+        '../chrome/chrome.gyp:unit_tests',
         '../ui/ui.gyp:gfx_unittests',
       ],
     },

android/buildbot_functions.sh

@@ -99,8 +99,7 @@ function bb_compile {
 # Experimental compile step; does not turn the tree red if it fails.
 function bb_compile_experimental {
   # Linking DumpRenderTree appears to hang forever?
-  # EXPERIMENTAL_TARGETS="DumpRenderTree webkit_unit_tests"
+  EXPERIMENTAL_TARGETS="android_experimental"
-  EXPERIMENTAL_TARGETS="webkit_unit_tests"
   for target in ${EXPERIMENTAL_TARGETS} ; do
     echo "@@@BUILD_STEP Experimental Compile $target @@@"
     set +e

android/gtest_filter/net_unittests_disabled

@@ -53,6 +53,9 @@ TransportSecurityStateTest.BogusPinsHeaders
 TransportSecurityStateTest.ValidPinsHeaders
 HTTPSRequestTest.ResumeTest
 HTTPSRequestTest.SSLSessionCacheShardTest
+# TODO(yfriedman): Can't load certificate
+#    net/data/ssl/certificates/root_ca_cert.crt
+HTTPSRequestTest.HTTPSErrorsNoClobberTSSTest
 # TODO(jrg): Fails on bots.  Works locally.  Figure out why.  2/6/12
 HttpCache.TypicalGET_ConditionalRequest
 HttpCache.RangeGET_OK