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

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

Issue 2227523002: Pass input_jars_paths of libs to final proguard step (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove print() Created 4 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
« no previous file with comments | « build/config/android/internal_rules.gni ('k') | no next file » | 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 import("//build/config/android/internal_rules.gni") 6 import("//build/config/android/internal_rules.gni")
7 import("//build/config/dcheck_always_on.gni") 7 import("//build/config/dcheck_always_on.gni")
8 import("//build/toolchain/toolchain.gni") 8 import("//build/toolchain/toolchain.gni")
9 9
10 assert(is_android) 10 assert(is_android)
(...skipping 1836 matching lines...) Expand 10 before | Expand all | Expand 10 after
1847 _build_config, 1847 _build_config,
1848 _jar_path, 1848 _jar_path,
1849 ] + _proguard_configs 1849 ] + _proguard_configs
1850 1850
1851 output_jar_path = _proguard_output_jar_path 1851 output_jar_path = _proguard_output_jar_path
1852 _rebased_proguard_configs = 1852 _rebased_proguard_configs =
1853 rebase_path(_proguard_configs, root_build_dir) 1853 rebase_path(_proguard_configs, root_build_dir)
1854 args = [ 1854 args = [
1855 "--proguard-configs=$_rebased_proguard_configs", 1855 "--proguard-configs=$_rebased_proguard_configs",
1856 "--input-paths=@FileArg($_rebased_build_config:proguard:input_paths)", 1856 "--input-paths=@FileArg($_rebased_build_config:proguard:input_paths)",
1857 "--classpath=@FileArg($_rebased_build_config:proguard:lib_paths)",
1857 ] 1858 ]
1858 if (defined(invoker.apk_under_test)) { 1859 if (defined(invoker.apk_under_test)) {
1859 deps += [ 1860 deps += [
1860 "${invoker.apk_under_test}__build_config", 1861 "${invoker.apk_under_test}__build_config",
1861 "${invoker.apk_under_test}__proguard", 1862 "${invoker.apk_under_test}__proguard",
1862 ] 1863 ]
1863 _apk_under_test_build_config = 1864 _apk_under_test_build_config =
1864 get_label_info(invoker.apk_under_test, "target_gen_dir") + "/" + 1865 get_label_info(invoker.apk_under_test, "target_gen_dir") + "/" +
1865 get_label_info(invoker.apk_under_test, "name") + ".build_config" 1866 get_label_info(invoker.apk_under_test, "name") + ".build_config"
1866 _rebased_apk_under_test_build_config = 1867 _rebased_apk_under_test_build_config =
(...skipping 812 matching lines...) Expand 10 before | Expand all | Expand 10 after
2679 _jar_targets = [] 2680 _jar_targets = []
2680 _counter = 0 2681 _counter = 0
2681 foreach(jar, _scanned_files.jars) { 2682 foreach(jar, _scanned_files.jars) {
2682 _counter += 1 2683 _counter += 1
2683 _current_target = "${target_name}__jar_$_counter" 2684 _current_target = "${target_name}__jar_$_counter"
2684 _jar_targets += [ ":$_current_target" ] 2685 _jar_targets += [ ":$_current_target" ]
2685 java_prebuilt(_current_target) { 2686 java_prebuilt(_current_target) {
2686 forward_variables_from(invoker, 2687 forward_variables_from(invoker,
2687 [ 2688 [
2688 "deps", 2689 "deps",
2690 "input_jars_paths",
2689 "requires_android", 2691 "requires_android",
2690 "jar_excluded_patterns", 2692 "jar_excluded_patterns",
2691 ]) 2693 ])
2692 if (!defined(deps)) { 2694 if (!defined(deps)) {
2693 deps = [] 2695 deps = []
2694 } 2696 }
2695 deps += _resource_targets + [ ":$_unpack_target_name" ] 2697 deps += _resource_targets + [ ":$_unpack_target_name" ]
2696 if (!defined(requires_android)) { 2698 if (!defined(requires_android)) {
2697 requires_android = true 2699 requires_android = true
2698 } 2700 }
2699 supports_android = true 2701 supports_android = true
2700 jar_path = "${_output_path}/$jar" 2702 jar_path = "${_output_path}/$jar"
2701 } 2703 }
2702 } 2704 }
2703 2705
2704 java_group(target_name) { 2706 java_group(target_name) {
2705 deps = _resource_targets + _jar_targets 2707 deps = _resource_targets + _jar_targets
2706 } 2708 }
2707 } 2709 }
2708 } 2710 }
OLDNEW
« no previous file with comments | « build/config/android/internal_rules.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698