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

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Builder.json

Issue 1775063002: [Android] Use mb on chromium.linux and tryserver.chromium.android. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: rebase Created 4 years, 9 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
Index: scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Builder.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Builder.json b/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Builder.json
index e982173035128957cf4420292e8d84cc5c385907..36369c4bb55f41231bc0825f0e6b3e2e6a79232e 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Builder.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Builder.json
@@ -133,6 +133,7 @@
],
"cwd": "[SLAVE_BUILD]",
"env": {
+ "GYP_CHROMIUM_NO_ACTION": "1",
"GYP_CROSSCOMPILE": "1",
"GYP_DEFINES": "OS=android component=static_library fastbuild=1 ffmpeg_branding=Chrome gomadir='[SLAVE_BUILD]/src/build/goma/client' proprietary_codecs=1 target_arch=arm test_isolation_mode=prepare use_goma=1",
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
@@ -252,6 +253,31 @@
"cmd": [
"python",
"-u",
+ "[SLAVE_BUILD]/src/tools/mb/mb.py",
+ "gen",
+ "-m",
+ "chromium.linux",
+ "-b",
+ "Android Builder",
+ "--config-file",
+ "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
+ "--goma-dir",
+ "[BUILD]/goma",
+ "--swarming-targets-file",
+ "browser_tests_apk\n",
+ "//out/Release"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "generate_build_files",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@swarming-targets-file.txt@browser_tests_apk@@@",
+ "@@@STEP_LOG_END@swarming-targets-file.txt@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
"--target",
"Release",

Powered by Google App Engine
This is Rietveld 408576698