Revert of Fix up javac.py's depfile to include all relevant inputs

build/android/gyp/javac.py

Index: build/android/gyp/javac.py
diff --git a/build/android/gyp/javac.py b/build/android/gyp/javac.py
index 0eacb3c4a60cf7ce01291fe9e3d2608d72ffa544..df5325f7f058d5c7915fef1acdc7ed057d855f26 100755
--- a/build/android/gyp/javac.py
+++ b/build/android/gyp/javac.py
@@ -420,12 +420,9 @@
 
   java_files = _FilterJavaFiles(java_files, options.javac_includes)
 
+  javac_cmd = ['javac']
   if options.use_errorprone_path:
-    javac_path = options.use_errorprone_path
-    javac_cmd = [javac_path] + ERRORPRONE_OPTIONS
-  else:
-    javac_path = distutils.spawn.find_executable('javac')
-    javac_cmd = [javac_path]
+    javac_cmd = [options.use_errorprone_path] + ERRORPRONE_OPTIONS
 
   javac_cmd.extend((
       '-g',
@@ -476,10 +473,8 @@
         else:
           classpath_inputs.append(path)
 
-  # GN already knows of java_files, so listing them just make things worse when
-  # they change.
-  depfile_deps = [javac_path] + classpath_inputs + options.java_srcjars
-  input_paths = depfile_deps + java_files
+  # Compute the list of paths that when changed, we need to rebuild.
+  input_paths = classpath_inputs + options.java_srcjars + java_files
 
   output_paths = [
       options.jar_path,
@@ -498,7 +493,6 @@
       lambda changes: _OnStaleMd5(changes, options, javac_cmd, java_files,
                                   classpath_inputs),
       options,
-      depfile_deps=depfile_deps,
       input_paths=input_paths,
       input_strings=javac_cmd,
       output_paths=output_paths,