Update experimental Java 8 support to use Desugar instead of Retrolambda

build/android/gyp/retrolambda.py

Index: build/android/gyp/retrolambda.py
diff --git a/build/android/gyp/retrolambda.py b/build/android/gyp/retrolambda.py
index 90e189a5a52679aa92db65a493c642e11ca0d718..8207fbc2874a1df5cab9274edf8dee2198b01729 100755
--- a/build/android/gyp/retrolambda.py
+++ b/build/android/gyp/retrolambda.py
@@ -52,7 +52,8 @@ def main():
   options = parser.parse_args(args)
 
   options.classpath = build_utils.ParseGnList(options.classpath)
-  input_paths = options.classpath + [options.input_jar]
+  input_paths = options.classpath + [options.input_jar,
+                                     options.android_sdk_jar]
   output_paths = [options.output_jar]
 
   build_utils.CallAndWriteDepfileIfStale(
@@ -61,7 +62,8 @@ def main():
       options,
       input_paths=input_paths,
       input_strings=[],
-      output_paths=output_paths)
+      output_paths=output_paths,
+      depfile_deps=input_paths)

[agrieve, 2017/07/20 18:24:09]

You should delete retrolambda in this change as well (rather than deleting it in
a follow-up). That way only a single commit needs to be reverted if it doesn't
work.

[F, 2017/07/20 19:40:55]

Done.

 
 
 if __name__ == '__main__':