🐝 Fix javac.py not running a change in a dependent library occurs

build/android/gyp/javac.py

 #!/usr/bin/env python
 #
 # Copyright 2013 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.
 
 import optparse
 import os
 import shutil
 import re
@@ skipping 333 matching lines @@
 
   if options.chromium_code:
     javac_cmd.extend(['-Xlint:unchecked', '-Xlint:deprecation'])
   else:
     # XDignore.symbol.file makes javac compile against rt.jar instead of
     # ct.sym. This means that using a java internal package/class will not
     # trigger a compile warning or error.
     javac_cmd.extend(['-XDignore.symbol.file'])
 
   classpath_inputs = options.bootclasspath
-  # TODO(agrieve): Remove this .TOC heuristic once GYP is no more.
-  if options.classpath and not options.classpath[0].endswith('.interface.jar'):
-    for path in options.classpath:
-      if os.path.exists(path + '.TOC'):
-        classpath_inputs.append(path + '.TOC')
-      else:
-        classpath_inputs.append(path)
+  if options.classpath:
+    if options.classpath[0].endswith('.interface.jar'):

[Yaron, 2016/04/18 14:49:41]

why do we only care about the first item? is it that we always receive either
interface jars or regular jars?

[agrieve, 2016/04/18 16:45:35]

Right. That's what the comment on 358 is meant to capture. GYP uses .TOC files.
Once it's gone, this can just be deleted.

+      classpath_inputs.extend(options.classpath)
+    else:
+      # TODO(agrieve): Remove this .TOC heuristic once GYP is no more.
+      for path in options.classpath:
+        if os.path.exists(path + '.TOC'):
+          classpath_inputs.append(path + '.TOC')
+        else:
+          classpath_inputs.append(path)
 
   # 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,
       options.jar_path.replace('.jar', '.excluded.jar'),
   ]
   if options.incremental:
     output_paths.append(options.jar_path + '.pdb')
@@ skipping 10 matching lines @@
       options,
       input_paths=input_paths,
       input_strings=javac_cmd,
       output_paths=output_paths,
       force=force,
       pass_changes=True)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))