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

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

Issue 2085723002: Revert of Roll internal Google Play Services (Chromium part) (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 ddc9c362b4c1158b2dc6652a6d07fe365c1d9e8b..0b9fa9d12400a017bf48db6fb98a71dcf85ddcb0 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -545,10 +545,6 @@
_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,
]
@@ -582,9 +578,6 @@
"--classpath",
_rebased_android_sdk_jar,
]
- foreach(c, _input_jars_paths) {
- args += [ "--classpath=" + c ]
- }
if (proguard_verbose) {
args += [ "--verbose" ]
}
@@ -808,12 +801,7 @@
template("process_java_prebuilt") {
set_sources_assignment_filter([])
- forward_variables_from(invoker,
- [
- "testonly",
- "input_jars_paths",
- ])
- assert(!defined(input_jars_paths) || input_jars_paths != [] || true) # Mark as used
+ forward_variables_from(invoker, [ "testonly" ])
assert(invoker.build_config != "")
_build_config = invoker.build_config
@@ -1608,10 +1596,7 @@
[
"jar_excluded_patterns",
"strip_resource_classes",
- "input_jars_paths",
])
- assert(!defined(input_jars_paths) || input_jars_paths != [] || true) # Mark as used
-
visibility = [
":$_ijar_target_name",
":$_template_name",
« no previous file with comments | « build/android/play_services/preprocess.py ('k') | chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698