OLD | NEW |
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("//base/android/linker/config.gni") | 5 import("//base/android/linker/config.gni") |
6 import("//build/config/android/config.gni") | 6 import("//build/config/android/config.gni") |
7 import("//build/config/android/internal_rules.gni") | 7 import("//build/config/android/internal_rules.gni") |
8 import("//build/config/sanitizers/sanitizers.gni") | 8 import("//build/config/sanitizers/sanitizers.gni") |
9 import("//build/toolchain/toolchain.gni") | 9 import("//build/toolchain/toolchain.gni") |
10 import("//third_party/android_platform/config.gni") | 10 import("//third_party/android_platform/config.gni") |
(...skipping 1507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1518 java_files = [] | 1518 java_files = [] |
1519 } | 1519 } |
1520 srcjar_deps = _srcjar_deps | 1520 srcjar_deps = _srcjar_deps |
1521 jar_path = _jar_path | 1521 jar_path = _jar_path |
1522 dex_path = _lib_dex_path | 1522 dex_path = _lib_dex_path |
1523 emma_never_instrument = _emma_never_instrument | 1523 emma_never_instrument = _emma_never_instrument |
1524 | 1524 |
1525 if (defined(invoker.deps)) { | 1525 if (defined(invoker.deps)) { |
1526 deps += invoker.deps | 1526 deps += invoker.deps |
1527 } | 1527 } |
| 1528 if (defined(invoker.apk_under_test)) { |
| 1529 deps += [ "${invoker.apk_under_test}__java" ] |
| 1530 } |
1528 } | 1531 } |
1529 | 1532 |
1530 # TODO(cjhopman): This is only ever needed to calculate the list of tests to | 1533 # TODO(cjhopman): This is only ever needed to calculate the list of tests to |
1531 # run. See build/android/pylib/instrumentation/test_jar.py. We should be | 1534 # run. See build/android/pylib/instrumentation/test_jar.py. We should be |
1532 # able to just do that calculation at build time instead. | 1535 # able to just do that calculation at build time instead. |
1533 if (defined(invoker.create_dist_ijar) && invoker.create_dist_ijar) { | 1536 if (defined(invoker.create_dist_ijar) && invoker.create_dist_ijar) { |
1534 _dist_ijar_path = "$root_build_dir/test.lib.java/" + | 1537 _dist_ijar_path = "$root_build_dir/test.lib.java/" + |
1535 get_path_info(_final_apk_path, "name") + ".jar" | 1538 get_path_info(_final_apk_path, "name") + ".jar" |
1536 action("${_template_name}_dist_ijar") { | 1539 action("${_template_name}_dist_ijar") { |
1537 script = "//build/android/gyp/create_dist_jar.py" | 1540 script = "//build/android/gyp/create_dist_jar.py" |
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1965 (defined(invoker.java_files) || defined(invoker.DEPRECATED_java_in_dir)) | 1968 (defined(invoker.java_files) || defined(invoker.DEPRECATED_java_in_dir)) |
1966 } | 1969 } |
1967 | 1970 |
1968 group(target_name) { | 1971 group(target_name) { |
1969 public_deps = [ | 1972 public_deps = [ |
1970 ":$_apk_target_name", | 1973 ":$_apk_target_name", |
1971 ":$_test_runner_target_name", | 1974 ":$_test_runner_target_name", |
1972 | 1975 |
1973 # Required by test runner to enumerate test list. | 1976 # Required by test runner to enumerate test list. |
1974 ":${_apk_target_name}_dist_ijar", | 1977 ":${_apk_target_name}_dist_ijar", |
| 1978 invoker.apk_under_test, |
1975 ] | 1979 ] |
1976 } | 1980 } |
1977 } | 1981 } |
1978 | 1982 |
1979 # Declare an Android gtest apk | 1983 # Declare an Android gtest apk |
1980 # | 1984 # |
1981 # This target creates an Android apk for running gtest-based unittests. | 1985 # This target creates an Android apk for running gtest-based unittests. |
1982 # | 1986 # |
1983 # Variables | 1987 # Variables |
1984 # deps: Specifies the dependencies of this target. These will be passed to | 1988 # deps: Specifies the dependencies of this target. These will be passed to |
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2284 } | 2288 } |
2285 | 2289 |
2286 android_library(target_name) { | 2290 android_library(target_name) { |
2287 java_files = [] | 2291 java_files = [] |
2288 srcjar_deps = [ ":${_template_name}__protoc_java" ] | 2292 srcjar_deps = [ ":${_template_name}__protoc_java" ] |
2289 deps = [ | 2293 deps = [ |
2290 "//third_party/android_protobuf:protobuf_nano_javalib", | 2294 "//third_party/android_protobuf:protobuf_nano_javalib", |
2291 ] | 2295 ] |
2292 } | 2296 } |
2293 } | 2297 } |
OLD | NEW |