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

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: jbudorick@'s 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
« no previous file with comments | « build/android/pylib/utils/proguard.py ('k') | build/java.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 set_sources_assignment_filter([]) 410 set_sources_assignment_filter([])
411 forward_variables_from(invoker, [ "testonly" ]) 411 forward_variables_from(invoker, [ "testonly" ])
412 412
413 _input_jar_path = invoker.input_jar_path 413 _input_jar_path = invoker.input_jar_path
414 _output_jar_path = invoker.output_jar_path 414 _output_jar_path = invoker.output_jar_path
415 _jar_toc_path = _output_jar_path + ".TOC" 415 _jar_toc_path = _output_jar_path + ".TOC"
416 416
417 assert(invoker.build_config != "") 417 assert(invoker.build_config != "")
418 418
419 if (defined(invoker.proguard_preprocess) && invoker.proguard_preprocess) { 419 if (defined(invoker.proguard_preprocess) && invoker.proguard_preprocess) {
420 _proguard_jar_path = "$android_sdk_root/tools/proguard/lib/proguard.jar" 420 _proguard_jar_path = "//third_party/proguard/lib/proguard.jar"
421 _proguard_config_path = invoker.proguard_config 421 _proguard_config_path = invoker.proguard_config
422 _build_config = invoker.build_config 422 _build_config = invoker.build_config
423 _rebased_build_config = rebase_path(_build_config, root_build_dir) 423 _rebased_build_config = rebase_path(_build_config, root_build_dir)
424 _output_jar_target = "${target_name}__proguard_process" 424 _output_jar_target = "${target_name}__proguard_process"
425 action(_output_jar_target) { 425 action(_output_jar_target) {
426 forward_variables_from(invoker, 426 forward_variables_from(invoker,
427 [ 427 [
428 "data_deps", 428 "data_deps",
429 "deps", 429 "deps",
430 "public_deps", 430 "public_deps",
(...skipping 1184 matching lines...) Expand 10 before | Expand all | Expand 10 after
1615 ] 1615 ]
1616 args = [ 1616 args = [
1617 "--depfile", 1617 "--depfile",
1618 rebase_path(depfile, root_build_dir), 1618 rebase_path(depfile, root_build_dir),
1619 "--script-output-path", 1619 "--script-output-path",
1620 rebase_path(generated_script, root_build_dir), 1620 rebase_path(generated_script, root_build_dir),
1621 ] 1621 ]
1622 args += test_runner_args 1622 args += test_runner_args
1623 } 1623 }
1624 } 1624 }
OLDNEW
« no previous file with comments | « build/android/pylib/utils/proguard.py ('k') | build/java.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698