Revert of [Android] Add a configurable environment for devil/. (RELAND)

build/android/PRESUBMIT.py

Index: build/android/PRESUBMIT.py
diff --git a/build/android/PRESUBMIT.py b/build/android/PRESUBMIT.py
index 278e9506ec4eabcbd9ac4f3108798546eebacc82..c97194f5ff4571a50e251017bacbb9b07011836d 100644
--- a/build/android/PRESUBMIT.py
+++ b/build/android/PRESUBMIT.py
@@ -12,12 +12,9 @@
 def CommonChecks(input_api, output_api):
   output = []
 
-  build_android_dir = input_api.PresubmitLocalPath()
-  chromium_src_dir = input_api.os_path.join(build_android_dir, '..', '..')
-
   def J(*dirs):
     """Returns a path relative to presubmit directory."""
-    return input_api.os_path.join(build_android_dir, *dirs)
+    return input_api.os_path.join(input_api.PresubmitLocalPath(), *dirs)
 
   build_pys = [
       r'gyp/.*\.py$',
@@ -43,7 +40,7 @@
 
   pylib_test_env = dict(input_api.environ)
   pylib_test_env.update({
-      'PYTHONPATH': build_android_dir,
+      'PYTHONPATH': input_api.PresubmitLocalPath(),
       'PYTHONDONTWRITEBYTECODE': '1',
   })
   output.extend(input_api.canned_checks.RunUnitTests(
@@ -51,6 +48,12 @@
       output_api,
       unit_tests=[
           J('.', 'emma_coverage_stats_test.py'),
+          J('devil', 'android', 'battery_utils_test.py'),
+          J('devil', 'android', 'device_utils_test.py'),
+          J('devil', 'android', 'md5sum_test.py'),
+          J('devil', 'android', 'logcat_monitor_test.py'),
+          J('devil', 'utils', 'cmd_helper_test.py'),
+          J('devil', 'utils', 'timeout_retry_unittest.py'),
           J('gyp', 'util', 'md5_check_test.py'),
           J('pylib', 'base', 'test_dispatcher_unittest.py'),
           J('pylib', 'gtest', 'gtest_test_instance_test.py'),
@@ -59,26 +62,6 @@
           J('pylib', 'results', 'json_results_test.py'),
       ],
       env=pylib_test_env))
-
-
-  devil_test_env = dict(pylib_test_env)
-  devil_test_env.update({
-      'DEVIL_ENV_CONFIG':
-          input_api.os_path.join(chromium_src_dir, 'build', 'android',
-                                 'devil_chromium.json')
-  })
-  output.extend(input_api.canned_checks.RunUnitTests(
-      input_api,
-      output_api,
-      unit_tests=[
-          J('devil', 'android', 'battery_utils_test.py'),
-          J('devil', 'android', 'device_utils_test.py'),
-          J('devil', 'android', 'md5sum_test.py'),
-          J('devil', 'android', 'logcat_monitor_test.py'),
-          J('devil', 'utils', 'cmd_helper_test.py'),
-          J('devil', 'utils', 'timeout_retry_unittest.py'),
-      ],
-      env=devil_test_env))
   return output