diff options
| author | agrieve <agrieve@chromium.org> | 2015-12-01 08:36:19 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-01 16:37:49 +0000 |
| commit | 97176368ff8be424d349132778d9c27624a1232d (patch) | |
| tree | f8fd18b17a2ed85b2a221052f8614a31b9b618cb /testing | |
| parent | 0d94fda8c494d7a6c27d065d782f42e99d834f46 (diff) | |
| download | chromium_src-97176368ff8be424d349132778d9c27624a1232d.zip chromium_src-97176368ff8be424d349132778d9c27624a1232d.tar.gz chromium_src-97176368ff8be424d349132778d9c27624a1232d.tar.bz2 | |
GN: Merge apk_deps and deps in test() template
apk_deps has been causing some unneccesary confusion.
BUG=558193
R=tfarina@chromium.org,brettw@chromium.org
Review URL: https://codereview.chromium.org/1465923002
Cr-Commit-Position: refs/heads/master@{#362432}
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/test.gni | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/testing/test.gni b/testing/test.gni index a280a1b..a150c24 100644 --- a/testing/test.gni +++ b/testing/test.gni @@ -28,6 +28,7 @@ template("test") { # Don't use "*" to forward all variables since some (like output_name # and isolate_file) apply only to the APK below. + deps = [] forward_variables_from(invoker, [ "all_dependent_configs", @@ -40,6 +41,7 @@ template("test") { "data_deps", "datadeps", "defines", + "deps", "include_dirs", "ldflags", "lib_dirs", @@ -53,36 +55,27 @@ template("test") { "visibility", ]) - deps = [] if (!defined(invoker.use_default_launcher) || invoker.use_default_launcher) { deps += [ "//testing/android/native_test:native_test_native_code" ] } - if (defined(invoker.deps)) { - deps += invoker.deps - } } unittest_apk(apk_name) { forward_variables_from(invoker, [ "android_manifest", + "deps", "use_default_launcher", "write_asset_list", ]) - unittests_dep = ":$library_name" apk_name = main_target_name if (defined(invoker.output_name)) { apk_name = invoker.output_name unittests_binary = "lib${apk_name}.so" } - deps = [ - ":$library_name", - ] - if (defined(invoker.apk_deps)) { - deps += invoker.apk_deps - } + deps += [ ":$library_name" ] if (defined(invoker.apk_asset_location)) { asset_location = invoker.apk_asset_location } |