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

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: Update proguard.flags. Created 5 years, 4 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 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 testonly = invoker.testonly 395 testonly = invoker.testonly
396 } 396 }
397 397
398 _input_jar_path = invoker.input_jar_path 398 _input_jar_path = invoker.input_jar_path
399 _output_jar_path = invoker.output_jar_path 399 _output_jar_path = invoker.output_jar_path
400 _jar_toc_path = _output_jar_path + ".TOC" 400 _jar_toc_path = _output_jar_path + ".TOC"
401 401
402 assert(invoker.build_config != "") 402 assert(invoker.build_config != "")
403 403
404 if (defined(invoker.proguard_preprocess) && invoker.proguard_preprocess) { 404 if (defined(invoker.proguard_preprocess) && invoker.proguard_preprocess) {
405 _proguard_jar_path = "$android_sdk_root/tools/proguard/lib/proguard.jar" 405 _proguard_jar_path = "//third_party/proguard/lib/proguard.jar"
406 _proguard_config_path = invoker.proguard_config 406 _proguard_config_path = invoker.proguard_config
407 _build_config = invoker.build_config 407 _build_config = invoker.build_config
408 _rebased_build_config = rebase_path(_build_config, root_build_dir) 408 _rebased_build_config = rebase_path(_build_config, root_build_dir)
409 _output_jar_target = "${target_name}__proguard_process" 409 _output_jar_target = "${target_name}__proguard_process"
410 action(_output_jar_target) { 410 action(_output_jar_target) {
411 script = "//build/android/gyp/proguard.py" 411 script = "//build/android/gyp/proguard.py"
412 inputs = [ 412 inputs = [
413 android_sdk_jar, 413 android_sdk_jar,
414 _proguard_jar_path, 414 _proguard_jar_path,
415 _build_config, 415 _build_config,
(...skipping 1165 matching lines...) Expand 10 before | Expand all | Expand 10 after
1581 ] 1581 ]
1582 args = [ 1582 args = [
1583 "--depfile", 1583 "--depfile",
1584 rebase_path(depfile, root_build_dir), 1584 rebase_path(depfile, root_build_dir),
1585 "--script-output-path", 1585 "--script-output-path",
1586 rebase_path(generated_script, root_build_dir), 1586 rebase_path(generated_script, root_build_dir),
1587 ] 1587 ]
1588 args += test_runner_args 1588 args += test_runner_args
1589 } 1589 }
1590 } 1590 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698