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

Side by Side Diff: build/config/android/internal_rules.gni

Issue 2031033002: Adding option for Proguard jar to be switched. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Findbugs suppression 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 unified diff | Download patch
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/sanitizers/sanitizers.gni") 6 import("//build/config/sanitizers/sanitizers.gni")
7 import("//build/config/zip.gni") 7 import("//build/config/zip.gni")
8 import("//third_party/ijar/ijar.gni") 8 import("//third_party/ijar/ijar.gni")
9 9
10 assert(is_android) 10 assert(is_android)
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 action(target_name) { 105 action(target_name) {
106 set_sources_assignment_filter([]) 106 set_sources_assignment_filter([])
107 forward_variables_from(invoker, 107 forward_variables_from(invoker,
108 [ 108 [
109 "deps", 109 "deps",
110 "data_deps", 110 "data_deps",
111 "public_deps", 111 "public_deps",
112 "testonly", 112 "testonly",
113 ]) 113 ])
114 script = "//build/android/gyp/proguard.py" 114 script = "//build/android/gyp/proguard.py"
115 _proguard_jar_path = "//third_party/proguard/lib/proguard.jar" 115 if (defined(invoker.proguard_jar_path)) {
116 _proguard_jar_path = invoker.proguard_jar_path
117 } else {
118 _proguard_jar_path = "//third_party/proguard/lib/proguard.jar"
119 }
116 _output_jar_path = invoker.output_jar_path 120 _output_jar_path = invoker.output_jar_path
117 inputs = [ 121 inputs = [
118 _proguard_jar_path, 122 _proguard_jar_path,
119 ] 123 ]
120 if (defined(invoker.alternative_android_sdk_jar)) { 124 if (defined(invoker.alternative_android_sdk_jar)) {
121 inputs += [ invoker.alternative_android_sdk_jar ] 125 inputs += [ invoker.alternative_android_sdk_jar ]
122 _rebased_android_sdk_jar = 126 _rebased_android_sdk_jar =
123 rebase_path(invoker.alternative_android_sdk_jar) 127 rebase_path(invoker.alternative_android_sdk_jar)
124 } else { 128 } else {
125 inputs += [ android_sdk_jar ] 129 inputs += [ android_sdk_jar ]
(...skipping 2197 matching lines...) Expand 10 before | Expand all | Expand 10 after
2323 2327
2324 args = [ 2328 args = [
2325 "--depfile", 2329 "--depfile",
2326 rebase_path(depfile, root_build_dir), 2330 rebase_path(depfile, root_build_dir),
2327 "--script-output-path", 2331 "--script-output-path",
2328 rebase_path(generated_script, root_build_dir), 2332 rebase_path(generated_script, root_build_dir),
2329 ] 2333 ]
2330 args += test_runner_args 2334 args += test_runner_args
2331 } 2335 }
2332 } 2336 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698