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

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 e8cee1ce7f72e8040e672ba57769adaebd81dff2..5722fb1d97a72dfbd63d8b9d1d94c5f7ca69c62e 100755
--- a/build/android/gyp/javac.py
+++ b/build/android/gyp/javac.py
@@ -351,13 +351,16 @@ def main(argv):
     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