Revert of WebRTC: Add android_junit_tests.

scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_swarming.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n  if os.path.exists(path):\n    print \"%s exists but is not a dir\" % path\n    sys.exit(1)\n  os.makedirs(path, mode)\n",
       "[BUILDER_CACHE]/android_swarming",
       "511"
     ],
     "name": "makedirs checkout path",
@@ skipping 209 matching lines @@
       "gen",
       "-m",
       "tryserver.webrtc",
       "-b",
       "android_swarming",
       "--config-file",
       "[BUILDER_CACHE]/android_swarming/src/webrtc/build/mb_config.pyl",
       "--goma-dir",
       "[CACHE]/cipd/goma",
       "--swarming-targets-file",
-      "AppRTCMobileTest\nandroid_junit_tests\naudio_decoder_unittests\ncommon_audio_unittests\ncommon_video_unittests\nlibjingle_peerconnection_android_unittest\nmodules_tests\nmodules_unittests\npeerconnection_unittests\nrtc_stats_unittests\nrtc_unittests\nsystem_wrappers_unittests\ntest_support_unittests\ntools_unittests\nvideo_engine_tests\nvoice_engine_unittests\nwebrtc_nonparallel_tests\n",
+      "AppRTCMobileTest\naudio_decoder_unittests\ncommon_audio_unittests\ncommon_video_unittests\nlibjingle_peerconnection_android_unittest\nmodules_tests\nmodules_unittests\npeerconnection_unittests\nrtc_stats_unittests\nrtc_unittests\nsystem_wrappers_unittests\ntest_support_unittests\ntools_unittests\nvideo_engine_tests\nvoice_engine_unittests\nwebrtc_nonparallel_tests\n",
       "--gyp-script=[BUILDER_CACHE]/android_swarming/src/webrtc/build/gyp_webrtc.py",
       "//out/Release"
     ],
     "cwd": "[BUILDER_CACHE]/android_swarming/src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
     "name": "generate_build_files",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@swarming-targets-file.txt@AppRTCMobileTest@@@",
-      "@@@STEP_LOG_LINE@swarming-targets-file.txt@android_junit_tests@@@",
       "@@@STEP_LOG_LINE@swarming-targets-file.txt@audio_decoder_unittests@@@",
       "@@@STEP_LOG_LINE@swarming-targets-file.txt@common_audio_unittests@@@",
       "@@@STEP_LOG_LINE@swarming-targets-file.txt@common_video_unittests@@@",
       "@@@STEP_LOG_LINE@swarming-targets-file.txt@libjingle_peerconnection_android_unittest@@@",
       "@@@STEP_LOG_LINE@swarming-targets-file.txt@modules_tests@@@",
       "@@@STEP_LOG_LINE@swarming-targets-file.txt@modules_unittests@@@",
       "@@@STEP_LOG_LINE@swarming-targets-file.txt@peerconnection_unittests@@@",
       "@@@STEP_LOG_LINE@swarming-targets-file.txt@rtc_stats_unittests@@@",
       "@@@STEP_LOG_LINE@swarming-targets-file.txt@rtc_unittests@@@",
       "@@@STEP_LOG_LINE@swarming-targets-file.txt@system_wrappers_unittests@@@",
@@ skipping 68 matching lines @@
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::isolate]/resources/isolate.py",
       "[BUILDER_CACHE]/android_swarming/src/tools/swarming_client",
       "batcharchive",
       "--dump-json",
       "/path/to/tmp/json",
       "--isolate-server",
       "https://isolateserver.appspot.com",
-      "[BUILDER_CACHE]/android_swarming/src/out/Release/android_junit_tests.isolated.gen.json",
       "[BUILDER_CACHE]/android_swarming/src/out/Release/audio_decoder_unittests.isolated.gen.json",
       "[BUILDER_CACHE]/android_swarming/src/out/Release/common_audio_unittests.isolated.gen.json",
       "[BUILDER_CACHE]/android_swarming/src/out/Release/common_video_unittests.isolated.gen.json",
       "[BUILDER_CACHE]/android_swarming/src/out/Release/modules_tests.isolated.gen.json",
       "[BUILDER_CACHE]/android_swarming/src/out/Release/modules_unittests.isolated.gen.json",
       "[BUILDER_CACHE]/android_swarming/src/out/Release/peerconnection_unittests.isolated.gen.json",
       "[BUILDER_CACHE]/android_swarming/src/out/Release/rtc_stats_unittests.isolated.gen.json",
       "[BUILDER_CACHE]/android_swarming/src/out/Release/rtc_unittests.isolated.gen.json",
       "[BUILDER_CACHE]/android_swarming/src/out/Release/system_wrappers_unittests.isolated.gen.json",
       "[BUILDER_CACHE]/android_swarming/src/out/Release/test_support_unittests.isolated.gen.json",
       "[BUILDER_CACHE]/android_swarming/src/out/Release/tools_unittests.isolated.gen.json",
       "[BUILDER_CACHE]/android_swarming/src/out/Release/video_engine_tests.isolated.gen.json",
       "[BUILDER_CACHE]/android_swarming/src/out/Release/voice_engine_unittests.isolated.gen.json",
       "[BUILDER_CACHE]/android_swarming/src/out/Release/webrtc_nonparallel_tests.isolated.gen.json",
       "[BUILDER_CACHE]/android_swarming/src/out/Release/AppRTCMobileTest.isolated.gen.json",
       "[BUILDER_CACHE]/android_swarming/src/out/Release/libjingle_peerconnection_android_unittest.isolated.gen.json"
     ],
     "cwd": "[BUILDER_CACHE]/android_swarming",
     "name": "isolate tests",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"AppRTCMobileTest\": \"[dummy hash for AppRTCMobileTest]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"android_junit_tests\": \"[dummy hash for android_junit_tests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"audio_decoder_unittests\": \"[dummy hash for audio_decoder_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"common_audio_unittests\": \"[dummy hash for common_audio_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"common_video_unittests\": \"[dummy hash for common_video_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"libjingle_peerconnection_android_unittest\": \"[dummy hash for libjingle_peerconnection_android_unittest]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"modules_tests\": \"[dummy hash for modules_tests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"modules_unittests\": \"[dummy hash for modules_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"peerconnection_unittests\": \"[dummy hash for peerconnection_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"rtc_stats_unittests\": \"[dummy hash for rtc_stats_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"rtc_unittests\": \"[dummy hash for rtc_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"system_wrappers_unittests\": \"[dummy hash for system_wrappers_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"test_support_unittests\": \"[dummy hash for test_support_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tools_unittests\": \"[dummy hash for tools_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"video_engine_tests\": \"[dummy hash for video_engine_tests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"voice_engine_unittests\": \"[dummy hash for voice_engine_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"webrtc_nonparallel_tests\": \"[dummy hash for webrtc_nonparallel_tests]\"@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
-      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"AppRTCMobileTest\": \"[dummy hash for AppRTCMobileTest]\", \"android_junit_tests\": \"[dummy hash for android_junit_tests]\", \"audio_decoder_unittests\": \"[dummy hash for audio_decoder_unittests]\", \"common_audio_unittests\": \"[dummy hash for common_audio_unittests]\", \"common_video_unittests\": \"[dummy hash for common_video_unittests]\", \"libjingle_peerconnection_android_unittest\": \"[dummy hash for libjingle_peerconnection_android_unittest]\", \"modules_tests\": \"[dummy hash for modules_tests]\", \"modules_unittests\": \"[dummy hash for modules_unittests]\", \"peerconnection_unittests\": \"[dummy hash for peerconnection_unittests]\", \"rtc_stats_unittests\": \"[dummy hash for rtc_stats_unittests]\", \"rtc_unittests\": \"[dummy hash for rtc_unittests]\", \"system_wrappers_unittests\": \"[dummy hash for system_wrappers_unittests]\", \"test_support_unittests\": \"[dummy hash for test_support_unittests]\", \"tools_unittests\": \"[dummy hash for tools_unittests]\", \"video_engine_tests\": \"[dummy hash for video_engine_tests]\", \"voice_engine_unittests\": \"[dummy hash for voice_engine_unittests]\", \"webrtc_nonparallel_tests\": \"[dummy hash for webrtc_nonparallel_tests]\"}@@@"
+      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"AppRTCMobileTest\": \"[dummy hash for AppRTCMobileTest]\", \"audio_decoder_unittests\": \"[dummy hash for audio_decoder_unittests]\", \"common_audio_unittests\": \"[dummy hash for common_audio_unittests]\", \"common_video_unittests\": \"[dummy hash for common_video_unittests]\", \"libjingle_peerconnection_android_unittest\": \"[dummy hash for libjingle_peerconnection_android_unittest]\", \"modules_tests\": \"[dummy hash for modules_tests]\", \"modules_unittests\": \"[dummy hash for modules_unittests]\", \"peerconnection_unittests\": \"[dummy hash for peerconnection_unittests]\", \"rtc_stats_unittests\": \"[dummy hash for rtc_stats_unittests]\", \"rtc_unittests\": \"[dummy hash for rtc_unittests]\", \"system_wrappers_unittests\": \"[dummy hash for system_wrappers_unittests]\", \"test_support_unittests\": \"[dummy hash for test_support_unittests]\", \"tools_unittests\": \"[dummy hash for tools_unittests]\", \"video_engine_tests\": \"[dummy hash for video_engine_tests]\", \"voice_engine_unittests\": \"[dummy hash for voice_engine_unittests]\", \"webrtc_nonparallel_tests\": \"[dummy hash for webrtc_nonparallel_tests]\"}@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[BUILDER_CACHE]/android_swarming/src/tools/swarming_client/swarming.py",
       "trigger",
       "--swarming",
       "https://chromium-swarm.appspot.com",
@@ skipping 1255 matching lines @@
     "cwd": "[BUILDER_CACHE]/android_swarming",
     "name": "[trigger] libjingle_peerconnection_android_unittest on Android",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"libjingle_peerconnection_android_unittest/Android/[dummy has/android_swarming/1337\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"libjingle_peerconnection_android_unittest/Android/[dummy has/android_swarming/1337\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[BUILDER_CACHE]/android_swarming/src/tools/swarming_client/swarming.py",
-      "trigger",
-      "--swarming",
-      "https://chromium-swarm.appspot.com",
-      "--isolate-server",
-      "https://isolateserver.appspot.com",
-      "--priority",
-      "30",
-      "--shards",
-      "1",
-      "--task-name",
-      "android_junit_tests/Android/[dummy has/android_swarming/1337",
-      "--dump-json",
-      "/path/to/tmp/json",
-      "--expiration",
-      "3600",
-      "--io-timeout",
-      "1200",
-      "--hard-timeout",
-      "3600",
-      "--dimension",
-      "android_devices",
-      "6",
-      "--dimension",
-      "device_type",
-      "bullhead",
-      "--dimension",
-      "os",
-      "Android",
-      "--dimension",
-      "pool",
-      "Chrome",
-      "--tag",
-      "buildername:android_swarming",
-      "--tag",
-      "buildnumber:1337",
-      "--tag",
-      "data:[dummy hash for android_junit_tests]",
-      "--tag",
-      "master:tryserver.webrtc",
-      "--tag",
-      "name:android_junit_tests",
-      "--tag",
-      "os:Android",
-      "--tag",
-      "project:webrtc",
-      "--tag",
-      "purpose:ManualTS",
-      "--tag",
-      "purpose:pre-commit",
-      "--tag",
-      "rietveld:https://fake.rietveld.url/666666/#ps1",
-      "--tag",
-      "slavename:slavename",
-      "--tag",
-      "stepname:android_junit_tests on Android",
-      "--idempotent",
-      "[dummy hash for android_junit_tests]"
-    ],
-    "cwd": "[BUILDER_CACHE]/android_swarming",
-    "name": "[trigger] android_junit_tests on Android",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"android_junit_tests/Android/[dummy has/android_swarming/1337\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"android_junit_tests/Android/[dummy has/android_swarming/1337\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@"
     ]
   },
   {
     "cmd": [
       "python",
@@ skipping 948 matching lines @@
       "@@@STEP_LOG_LINE@json.output@      \"try_number\": 1, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"user\": \"unknown\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  ]@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@STEP_LINK@shard #0 isolated out@blah@@@"
     ]
   },
   {
-    "cmd": [
-      "python",
-      "-u",
-      "[BUILDER_CACHE]/android_swarming/src/tools/swarming_client/swarming.py",
-      "collect",
-      "--swarming",
-      "https://chromium-swarm.appspot.com",
-      "--decorate",
-      "--print-status-updates",
-      "--json",
-      "{\"base_task_name\": \"android_junit_tests/Android/[dummy has/android_swarming/1337\", \"tasks\": {\"android_junit_tests/Android/[dummy has/android_swarming/1337\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
-      "--task-summary-json",
-      "/path/to/tmp/json"
-    ],
-    "cwd": "[BUILDER_CACHE]/android_swarming",
-    "name": "android_junit_tests on Android",
-    "~followup_annotations": [
-      "@@@STEP_TEXT@swarming pending 71s@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"shards\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@    {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"abandoned_ts\": null, @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"bot_id\": \"vm30\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"completed_ts\": \"2014-09-25T01:42:00.123\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"created_ts\": \"2014-09-25T01:41:00.123\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"durations\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@        5.7, @@@",
-      "@@@STEP_LOG_LINE@json.output@        31.5@@@",
-      "@@@STEP_LOG_LINE@json.output@      ], @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"exit_codes\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@        0, @@@",
-      "@@@STEP_LOG_LINE@json.output@        0@@@",
-      "@@@STEP_LOG_LINE@json.output@      ], @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"failure\": false, @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"id\": \"148aa78d7aa0000\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"internal_failure\": false, @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"isolated_out\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"isolated\": \"abc123\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"isolatedserver\": \"https://isolateserver.appspot.com\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"namespace\": \"default-gzip\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"view_url\": \"blah\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"modified_ts\": \"2014-09-25 01:42:00\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"name\": \"heartbeat-canary-2014-09-25_01:41:55-os=Windows\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"outputs\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"Heart beat succeeded on win32.\\n\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"Foo\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      ], @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"started_ts\": \"2014-09-25T01:42:11.123\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"state\": 112, @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"try_number\": 1, @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"user\": \"unknown\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  ]@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@STEP_LINK@shard #0 isolated out@blah@@@"
-    ]
-  },
-  {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]