Run base_unittests_apk on the test try bot for realz.

This will make the android_test bot red when apk tests fail.

The ANDROID_APK_TEST_TARGET flag is required while we transition from executable to APK tests.
 - Executable tests need the DIR_CACHE override as the default path comes from the java side.

BUG=125059

Review URL: https://chromiumcodereview.appspot.com/10332230

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138407 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 0 deletions

diff --git a/base/test/test_stub_android.cc b/base/test/test_stub_android.cc
index 05dc4e8..aaf952e 100644
--- a/base/test/test_stub_android.cc
+++ b/base/test/test_stub_android.cc
@@ -137,10 +137,14 @@ bool PathTestProviderAndroid(int key, FilePath* result) {
       *result = FilePath(kAndroidTestTempDirectory);
       return true;
     }
+#if !defined(ANDROID_APK_TEST_TARGET)
+    // When running as executable we need to use /data/local/tmp as the
+    // cache directory.
     case base::DIR_CACHE: {
       *result = FilePath(kAndroidTestTempDirectory);
       return true;
     }
+#endif  // !defined(ANDROID_APK_TEST_TARGET)
     case base::DIR_ANDROID_APP_DATA: {
       *result = FilePath(kAndroidTestTempDirectory);
       return true;