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

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

Issue 1292313004: Update usage of Proguard in clank after moving Proguard to third_party. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert changes in progard.flags Created 5 years, 3 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 6
7 assert(is_android) 7 assert(is_android)
8 8
9 rebased_android_sdk = rebase_path(android_sdk, root_build_dir) 9 rebased_android_sdk = rebase_path(android_sdk, root_build_dir)
10 rebased_android_sdk_root = rebase_path(android_sdk_root, root_build_dir) 10 rebased_android_sdk_root = rebase_path(android_sdk_root, root_build_dir)
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 set_sources_assignment_filter([]) 368 set_sources_assignment_filter([])
369 forward_variables_from(invoker, [ "testonly" ]) 369 forward_variables_from(invoker, [ "testonly" ])
370 370
371 _input_jar_path = invoker.input_jar_path 371 _input_jar_path = invoker.input_jar_path
372 _output_jar_path = invoker.output_jar_path 372 _output_jar_path = invoker.output_jar_path
373 _jar_toc_path = _output_jar_path + ".TOC" 373 _jar_toc_path = _output_jar_path + ".TOC"
374 374
375 assert(invoker.build_config != "") 375 assert(invoker.build_config != "")
376 376
377 if (defined(invoker.proguard_preprocess) && invoker.proguard_preprocess) { 377 if (defined(invoker.proguard_preprocess) && invoker.proguard_preprocess) {
378 _proguard_jar_path = "$android_sdk_root/tools/proguard/lib/proguard.jar" 378 _proguard_jar_path = "//third_party/proguard/lib/proguard.jar"
379 _proguard_config_path = invoker.proguard_config 379 _proguard_config_path = invoker.proguard_config
380 _build_config = invoker.build_config 380 _build_config = invoker.build_config
381 _rebased_build_config = rebase_path(_build_config, root_build_dir) 381 _rebased_build_config = rebase_path(_build_config, root_build_dir)
382 _output_jar_target = "${target_name}__proguard_process" 382 _output_jar_target = "${target_name}__proguard_process"
383 action(_output_jar_target) { 383 action(_output_jar_target) {
384 forward_variables_from(invoker, 384 forward_variables_from(invoker,
385 [ 385 [
386 "data_deps", 386 "data_deps",
387 "deps", 387 "deps",
388 "public_deps", 388 "public_deps",
(...skipping 1113 matching lines...) Expand 10 before | Expand all | Expand 10 after
1502 ] 1502 ]
1503 args = [ 1503 args = [
1504 "--depfile", 1504 "--depfile",
1505 rebase_path(depfile, root_build_dir), 1505 rebase_path(depfile, root_build_dir),
1506 "--script-output-path", 1506 "--script-output-path",
1507 rebase_path(generated_script, root_build_dir), 1507 rebase_path(generated_script, root_build_dir),
1508 ] 1508 ]
1509 args += test_runner_args 1509 args += test_runner_args
1510 } 1510 }
1511 } 1511 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698