Run App tests on Android.

mojo/tools/get_test_list.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Central list of tests to run (as appropriate for a given config). Add tests
 to run by modifying this file.
 
 Note that this file is both imported (by mojob.py) and run directly (via a
 recipe)."""
@@ skipping 57 matching lines @@
   # TODO(vtl): Currently, we only know how to run tests for Android, Linux, or
   # Windows.
   if target_os not in (Config.OS_ANDROID, Config.OS_LINUX, Config.OS_WINDOWS):
     return test_list
 
   # Tests run by default -------------------------------------------------------
 
   # C++ unit tests:
   if ShouldRunTest(Config.TEST_TYPE_DEFAULT, Config.TEST_TYPE_UNIT):
     unit_test_command = [os.path.join("mojo", "tools", "test_runner.py")]
-    if target_os == Config.OS_ANDROID:
-      unit_test_command.append("--android")
     unit_test_command.extend(
         [os.path.join("mojo", "tools", "data", "unittests"), build_dir,
         "mojob_test_successes"])
     AddXvfbEntry("Unit tests", unit_test_command)
 
   # C++ app tests:
-  if target_os != Config.OS_ANDROID and ShouldRunTest(Config.TEST_TYPE_DEFAULT,
-                                                      "app"):
+  if ShouldRunTest(Config.TEST_TYPE_DEFAULT, "app"):
     AddXvfbEntry("App tests",
                  [os.path.join("mojo", "tools", "apptest_runner.py"),
                   os.path.join("mojo", "tools", "data", "apptests"),
                   build_dir])
 
   # Python unit tests:
   if ShouldRunTest(Config.TEST_TYPE_DEFAULT, Config.TEST_TYPE_UNIT, "python"):
     AddEntry("Python unit tests",
              ["python", os.path.join("mojo", "tools",
               "run_mojo_python_tests.py")])
@@ skipping 105 matching lines @@
   config = Config(**json.load(args.config_file))
   test_list = GetTestList(config)
   json.dump(test_list, args.test_list_file, indent=2)
   args.test_list_file.write("\n")
 
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(main())