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

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

Issue 1690983002: Reland of Make instrumentation_test_apk depend on their apk_under_test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dist-jar
Patch Set: fix proguard failure Created 4 years, 10 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 import("//build/config/sanitizers/sanitizers.gni") 6 import("//build/config/sanitizers/sanitizers.gni")
7 import("//build/config/zip.gni") 7 import("//build/config/zip.gni")
8 import("//third_party/ijar/ijar.gni") 8 import("//third_party/ijar/ijar.gni")
9 9
10 assert(is_android) 10 assert(is_android)
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 } 432 }
433 if (requires_android) { 433 if (requires_android) {
434 args += [ "--requires-android" ] 434 args += [ "--requires-android" ]
435 } 435 }
436 if (defined(invoker.bypass_platform_checks) && 436 if (defined(invoker.bypass_platform_checks) &&
437 invoker.bypass_platform_checks) { 437 invoker.bypass_platform_checks) {
438 args += [ "--bypass-platform-checks" ] 438 args += [ "--bypass-platform-checks" ]
439 } 439 }
440 440
441 if (defined(invoker.apk_under_test)) { 441 if (defined(invoker.apk_under_test)) {
442 deps += [ invoker.apk_under_test ] 442 deps += [ "${invoker.apk_under_test}__build_config" ]
443 apk_under_test_gen_dir = 443 apk_under_test_gen_dir =
444 get_label_info(invoker.apk_under_test, "target_gen_dir") 444 get_label_info(invoker.apk_under_test, "target_gen_dir")
445 apk_under_test_name = get_label_info(invoker.apk_under_test, "name") 445 apk_under_test_name = get_label_info(invoker.apk_under_test, "name")
446 apk_under_test_config = 446 apk_under_test_config =
447 "$apk_under_test_gen_dir/$apk_under_test_name.build_config" 447 "$apk_under_test_gen_dir/$apk_under_test_name.build_config"
448 args += [ 448 args += [
449 "--tested-apk-config", 449 "--tested-apk-config",
450 rebase_path(apk_under_test_config, root_build_dir), 450 rebase_path(apk_under_test_config, root_build_dir),
451 ] 451 ]
452 } 452 }
(...skipping 1688 matching lines...) Expand 10 before | Expand all | Expand 10 after
2141 ] 2141 ]
2142 args = [ 2142 args = [
2143 "--depfile", 2143 "--depfile",
2144 rebase_path(depfile, root_build_dir), 2144 rebase_path(depfile, root_build_dir),
2145 "--script-output-path", 2145 "--script-output-path",
2146 rebase_path(generated_script, root_build_dir), 2146 rebase_path(generated_script, root_build_dir),
2147 ] 2147 ]
2148 args += test_runner_args 2148 args += test_runner_args
2149 } 2149 }
2150 } 2150 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698