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

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

Issue 2515383002: Pass deps to emma_instr target (Closed)
Patch Set: address comment Created 4 years, 1 month 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 | « no previous file | 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 # Do not add any imports to non-//build directories here. 5 # Do not add any imports to non-//build directories here.
6 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in. 6 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
7 import("//build_overrides/build.gni") 7 import("//build_overrides/build.gni")
8 import("//build/config/android/config.gni") 8 import("//build/config/android/config.gni")
9 import("//build/config/sanitizers/sanitizers.gni") 9 import("//build/config/sanitizers/sanitizers.gni")
10 10
(...skipping 2091 matching lines...) Expand 10 before | Expand all | Expand 10 after
2102 ] 2102 ]
2103 if (defined(invoker.deps)) { 2103 if (defined(invoker.deps)) {
2104 deps += invoker.deps 2104 deps += invoker.deps
2105 } 2105 }
2106 } 2106 }
2107 2107
2108 if (_emma_instrument) { 2108 if (_emma_instrument) {
2109 emma_instr(_emma_instr_target_name) { 2109 emma_instr(_emma_instr_target_name) {
2110 forward_variables_from(invoker, 2110 forward_variables_from(invoker,
2111 [ 2111 [
2112 "deps",
2112 "java_files", 2113 "java_files",
2113 "java_sources_file", 2114 "java_sources_file",
2114 ]) 2115 ])
2115 2116
2116 input_jar_path = _process_prebuilt_jar_path 2117 input_jar_path = _process_prebuilt_jar_path
2117 output_jar_path = _final_jar_path 2118 output_jar_path = _final_jar_path
2118 2119
2119 deps = [ 2120 if (!defined(deps)) {
2120 ":$_process_prebuilt_target_name", 2121 deps = []
2121 ] 2122 }
2123 deps += [ ":$_process_prebuilt_target_name" ]
2122 } 2124 }
2123 } 2125 }
2124 2126
2125 generate_interface_jar(_ijar_target_name) { 2127 generate_interface_jar(_ijar_target_name) {
2126 if (!defined(invoker.proguard_preprocess) || 2128 if (!defined(invoker.proguard_preprocess) ||
2127 !invoker.proguard_preprocess) { 2129 !invoker.proguard_preprocess) {
2128 # Always used the unfiltered .jar to create the interface jar so that 2130 # Always used the unfiltered .jar to create the interface jar so that
2129 # other targets will resolve filtered classes when depending on 2131 # other targets will resolve filtered classes when depending on
2130 # BuildConfig, NativeLibraries, etc. 2132 # BuildConfig, NativeLibraries, etc.
2131 input_jar = _javac_jar_path 2133 input_jar = _javac_jar_path
(...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after
2696 rebase_path(root_build_dir, root_build_dir), 2698 rebase_path(root_build_dir, root_build_dir),
2697 "--packed-libraries-dir", 2699 "--packed-libraries-dir",
2698 rebase_path(_packed_libraries_dir, root_build_dir), 2700 rebase_path(_packed_libraries_dir, root_build_dir),
2699 "--libraries=${invoker.libraries_filearg}", 2701 "--libraries=${invoker.libraries_filearg}",
2700 "--filelistjson", 2702 "--filelistjson",
2701 rebase_path(invoker.file_list_json, root_build_dir), 2703 rebase_path(invoker.file_list_json, root_build_dir),
2702 ] 2704 ]
2703 } 2705 }
2704 } 2706 }
2705 } 2707 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698