Android: Remove unused "add_pydeps" parameter from CallAndWriteDepfileIfStale()

Change-Id: Ie638c6f3d05c548056a8f78a83ac7f243bff0472
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1841751
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703364}

build/android/gyp/dex.py

@@ -402,8 +402,7 @@ def main(args):
       output_paths=output_paths,
       input_paths=input_paths,
       input_strings=dex_cmd + [bool(options.incremental_dir)],
-      pass_changes=True,
-      add_pydeps=False)
+      pass_changes=True)
 
 
 if __name__ == '__main__':

build/android/gyp/javac.py

@@ -600,8 +600,7 @@ def main(argv):
       depfile_deps=depfile_deps,
       input_paths=input_paths,
       input_strings=input_strings,
-      output_paths=output_paths,
-      add_pydeps=False)
+      output_paths=output_paths)
   logging.info('Script complete: %s', __file__)
 
 

build/android/gyp/lint.py

@@ -439,8 +439,7 @@ def main():
       input_paths=input_paths,
       input_strings=input_strings,
       output_paths=output_paths,
-      depfile_deps=classpath,
-      add_pydeps=False)
+      depfile_deps=classpath)
 
 
 if __name__ == '__main__':

build/android/gyp/prepare_resources.py

@@ -295,8 +295,7 @@ def main(args):
       input_paths=input_paths,
       input_strings=input_strings,
       output_paths=output_paths,
-      depfile_deps=depfile_deps,
-      add_pydeps=False)
+      depfile_deps=depfile_deps)
 
 
 if __name__ == '__main__':

build/android/gyp/util/build_utils.py

@@ -642,8 +642,7 @@ def CallAndWriteDepfileIfStale(on_stale_md5,
                                output_paths=None,
                                force=False,
                                pass_changes=False,
-                               depfile_deps=None,
-                               add_pydeps=True):
+                               depfile_deps=None):
   """Wraps md5_check.CallAndRecordIfStale() and writes a depfile if applicable.
 
   Depfiles are automatically added to output_paths when present in the |options|
@@ -661,10 +660,7 @@ def CallAndWriteDepfileIfStale(on_stale_md5,
   input_strings = list(input_strings or [])
   output_paths = list(output_paths or [])
 
-  python_deps = None
-  if hasattr(options, 'depfile') and options.depfile:
-    python_deps = _ComputePythonDependencies()
-    input_paths += python_deps
+  input_paths += _ComputePythonDependencies()
 
   md5_check.CallAndRecordIfStale(
       on_stale_md5,
@@ -678,9 +674,6 @@ def CallAndWriteDepfileIfStale(on_stale_md5,
   # Write depfile even when inputs have not changed to ensure build correctness
   # on bots that build with & without patch, and the patch changes the depfile
   # location.
-  if python_deps is not None:
-    all_depfile_deps = list(python_deps) if add_pydeps else []
-    if depfile_deps:
-      all_depfile_deps.extend(depfile_deps)
+  if hasattr(options, 'depfile') and options.depfile:
     WriteDepfile(
-        options.depfile, output_paths[0], all_depfile_deps, add_pydeps=False)
+        options.depfile, output_paths[0], depfile_deps, add_pydeps=False)