Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(685)

Unified Diff: build/config/android/internal_rules.gni

Issue 2103193002: 🎏 Fix google_play_services_default_java including legacy_http_javalib as a dep rather tha (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index 661ed253a3ad83bcb163df9d8264cb151896854c..4aa304e7f735bab55ca2d21c4ad7ee900be636bf 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -557,9 +557,7 @@ if (enable_java_templates) {
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 =
@@ -591,7 +589,7 @@ if (enable_java_templates) {
_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,
agrieve 2016/06/28 18:35:05 :( That's definitely the wrong place for it. We'll
paulmiller 2016/06/28 18:40:48 I would have thought that rebase_path would be sma
}
if (proguard_verbose) {
args += [ "--verbose" ]
« no previous file with comments | « no previous file | build/secondary/third_party/android_tools/BUILD.gn » ('j') | build/secondary/third_party/android_tools/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698