🎏 Fix google_play_services_default_java including legacy_http_javalib as a dep rather tha

build/config/android/internal_rules.gni

 # Copyright 2014 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("//build/config/android/config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 
 assert(is_android)
 
 # Write the target's .build_config file. This is a json file that contains a
@@ skipping 539 matching lines @@
       if (defined(invoker.proguard_jar_path)) {
         _proguard_jar_path = invoker.proguard_jar_path
       } else {
         _proguard_jar_path = "//third_party/proguard/lib/proguard.jar"
       }
       _output_jar_path = invoker.output_jar_path
       _input_jars_paths = []
       if (defined(invoker.input_jars_paths)) {
         _input_jars_paths += invoker.input_jars_paths
       }
-      inputs = [
-        _proguard_jar_path,
-      ]
+      inputs = _input_jars_paths + [ _proguard_jar_path ]
       if (defined(invoker.alternative_android_sdk_jar)) {
         inputs += [ invoker.alternative_android_sdk_jar ]
         _rebased_android_sdk_jar =
             rebase_path(invoker.alternative_android_sdk_jar)
       } else {
         inputs += [ android_sdk_jar ]
         _rebased_android_sdk_jar = rebased_android_sdk_jar
       }
       if (defined(invoker.inputs)) {
         inputs += invoker.inputs
@@ skipping 11 matching lines @@
         "--depfile",
         rebase_path(depfile, root_build_dir),
         "--proguard-path",
         rebase_path(_proguard_jar_path, root_build_dir),
         "--output-path",
         rebase_path(_output_jar_path, root_build_dir),
         "--classpath",
         _rebased_android_sdk_jar,
       ]
       foreach(c, _input_jars_paths) {
-        args += [ "--classpath=" + c ]
+        args += [ "--classpath=" + rebase_path(c, root_build_dir) ]

[paulmiller, 2016/06/28 18:10:20]

I did the rebase in third_party/android/BUILD.gn, downstream. If we're doing it
here, then we should remove it there.

[agrieve, 2016/06/28 18:35:05]

:( That's definitely the wrong place for it. We'll have to manually roll to fix
it I think. (I don't see how to change this without breaking an existing
already-rebased usage).

[paulmiller, 2016/06/28 18:40:48]

I would have thought that rebase_path would be smart enough to work on paths
that are already rebased. Is that not the case?

       }
       if (proguard_verbose) {
         args += [ "--verbose" ]
       }
       if (defined(invoker.args)) {
         args += invoker.args
       }
     }
   }
 
@@ skipping 1790 matching lines @@
       outputs = [
         depfile,
         invoker.out_manifest,
       ]
       inputs = [
         invoker.main_manifest,
       ]
     }
   }
 }