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

Unified Diff: build/android/BUILD.gn

Issue 1812383003: [Devil] Replace generated Devil config with jinja template. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed android platform name. Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/android/android.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/BUILD.gn
diff --git a/build/android/BUILD.gn b/build/android/BUILD.gn
index af819ed3ce62c8e4cb3482e4f6b787177e8687e5..7957f10b0e56dbef091e1d2bf9abc1dd5420df18 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"
+
+ _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",
@@ -100,10 +115,14 @@ group("test_runner_py") {
"//third_party/android_tools/sdk/platform-tools/adb",
"//third_party/catapult/third_party/gsutil/",
"//third_party/catapult/devil/devil/devil_dependencies.json",
+ "$root_gen_dir/devil_chromium.json",
]
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
« no previous file with comments | « no previous file | build/android/android.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698