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

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

Issue 2131453002: 🎦 Add missing dep when emma_coverage=true (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 | « 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 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/toolchain/toolchain.gni") 7 import("//build/toolchain/toolchain.gni")
8 8
9 assert(is_android) 9 assert(is_android)
10 10
(...skipping 1765 matching lines...) Expand 10 before | Expand all | Expand 10 after
1776 jar_path = _jar_path 1776 jar_path = _jar_path
1777 dex_path = _lib_dex_path 1777 dex_path = _lib_dex_path
1778 emma_never_instrument = _emma_never_instrument 1778 emma_never_instrument = _emma_never_instrument
1779 1779
1780 if (defined(invoker.deps)) { 1780 if (defined(invoker.deps)) {
1781 deps += invoker.deps 1781 deps += invoker.deps
1782 } 1782 }
1783 if (defined(invoker.apk_under_test)) { 1783 if (defined(invoker.apk_under_test)) {
1784 deps += [ "${invoker.apk_under_test}__java" ] 1784 deps += [ "${invoker.apk_under_test}__java" ]
1785 } 1785 }
1786 if (emma_coverage && !_emma_never_instrument) {
1787 deps += [ "//third_party/android_tools:emma_device" ]
1788 }
1786 } 1789 }
1787 1790
1788 # TODO(cjhopman): This is only ever needed to calculate the list of tests to 1791 # TODO(cjhopman): This is only ever needed to calculate the list of tests to
1789 # run. See build/android/pylib/instrumentation/test_jar.py. We should be 1792 # run. See build/android/pylib/instrumentation/test_jar.py. We should be
1790 # able to just do that calculation at build time instead. 1793 # able to just do that calculation at build time instead.
1791 if (defined(invoker.create_dist_ijar) && invoker.create_dist_ijar) { 1794 if (defined(invoker.create_dist_ijar) && invoker.create_dist_ijar) {
1792 _dist_ijar_path = "$root_build_dir/test.lib.java/" + 1795 _dist_ijar_path = "$root_build_dir/test.lib.java/" +
1793 get_path_info(_final_apk_path, "name") + ".jar" 1796 get_path_info(_final_apk_path, "name") + ".jar"
1794 action("${_template_name}_dist_ijar") { 1797 action("${_template_name}_dist_ijar") {
1795 script = "//build/android/gyp/create_dist_jar.py" 1798 script = "//build/android/gyp/create_dist_jar.py"
(...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after
2543 android_library(target_name) { 2546 android_library(target_name) {
2544 chromium_code = false 2547 chromium_code = false
2545 java_files = [] 2548 java_files = []
2546 srcjar_deps = [ ":${_template_name}__protoc_java" ] 2549 srcjar_deps = [ ":${_template_name}__protoc_java" ]
2547 deps = [ 2550 deps = [
2548 "//third_party/android_protobuf:protobuf_nano_javalib", 2551 "//third_party/android_protobuf:protobuf_nano_javalib",
2549 ] 2552 ]
2550 } 2553 }
2551 } 2554 }
2552 } 2555 }
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