Chromium Code Reviews| Index: build/android/BUILD.gn |
| diff --git a/build/android/BUILD.gn b/build/android/BUILD.gn |
| index af819ed3ce62c8e4cb3482e4f6b787177e8687e5..cc300db3d284ea1db96b2a6046507b520afefa8c 100644 |
| --- a/build/android/BUILD.gn |
| +++ b/build/android/BUILD.gn |
| @@ -84,6 +84,22 @@ action("cpplib_stripped") { |
| ] |
| } |
| +jinja_template("devil_chromium_config") { |
| + input = "//build/android/devil_chromium.jinja" |
| + output = "$root_gen_dir/devil_chromium.json" |
|
jbudorick
2016/04/05 21:10:49
Does this output file wind up in the data for test
mikecase (-- gone --)
2016/04/08 17:20:05
Added this file to the data in test_runner_py.
|
| + |
| + _rebased_android_sdk_root = |
| + rebase_path(default_android_sdk_root, root_gen_dir) |
| + _rebased_output_dir = rebase_path(root_build_dir, root_gen_dir) |
| + |
| + variables = [ |
| + "android_app_abi=$android_app_abi", |
| + "android_sdk_root=$_rebased_android_sdk_root", |
| + "build_tools_version=$default_android_sdk_build_tools_version", |
| + "output_dir=$_rebased_output_dir", |
| + ] |
| +} |
| + |
| group("test_runner_py") { |
| _py_files = read_file("test_runner.pydeps", "list lines") |
| @@ -92,7 +108,6 @@ group("test_runner_py") { |
| sources = _py_files |
| data = sources + [ |
| - "devil_chromium.json", |
| "//third_party/android_tools/sdk/build-tools/23.0.1/aapt", |
| "//third_party/android_tools/sdk/build-tools/23.0.1/dexdump", |
| "//third_party/android_tools/sdk/build-tools/23.0.1/lib/libc++.so", |
| @@ -104,6 +119,9 @@ group("test_runner_py") { |
| data_deps = [ |
| "//tools/swarming_client:isolate_py", |
| ] |
| + deps = [ |
| + "//build/android:devil_chromium_config", |
| + ] |
| } |
| # Create wrapper scripts in out/bin that takes care of setting the |