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

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

Issue 303513002: Initial work towards public Android recipes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 6 years, 7 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_chromiumos_Linux_ChromiumOS_Builder.json b/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Builder.json
similarity index 75%
copy from scripts/slave/recipes/chromium.expected/full_chromium_chromiumos_Linux_ChromiumOS_Builder.json
copy to scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Builder.json
index 0f971f8ae8a5907c13528f190ff4d62d5905c57e..6f622d9b5a4d9ad69a3fd93a8624ebb45f62c9c6 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_chromiumos_Linux_ChromiumOS_Builder.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Builder.json
@@ -6,13 +6,13 @@
"-u",
"[BUILD]/scripts/slave/bot_update.py",
"--master",
- "chromium.chromiumos",
+ "chromium.linux",
"--builder",
- "Linux ChromiumOS Builder",
+ "Android Builder",
"--slave",
"TestSlavename",
"--spec",
- "cache_dir = None\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]",
+ "cache_dir = None\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']",
"--revision_mapping_file",
"{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/WebKit\": \"got_webkit_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarm_client\": \"got_swarm_client_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
"--output_json",
@@ -33,7 +33,7 @@
"[DEPOT_TOOLS]/gclient.py",
"config",
"--spec",
- "cache_dir = None\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]"
+ "cache_dir = None\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']"
],
"name": "gclient setup"
},
@@ -96,7 +96,8 @@
"runhooks"
],
"env": {
- "GYP_DEFINES": "chromeos=1 component=static_library ffmpeg_branding=ChromeOS gomadir='[BUILD]/goma' proprietary_codecs=1 target_arch=x64 use_goma=1"
+ "GYP_CROSSCOMPILE": "1",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1"
},
"name": "gclient runhooks"
},
@@ -105,12 +106,12 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/testing/buildbot/chromium.chromiumos.json",
+ "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json",
"/path/to/tmp/json"
],
"name": "read test spec",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.chromiumos.json@@@",
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
"@@@STEP_LOG_LINE@json.output@{}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -140,13 +141,13 @@
"--goma-dir",
"[BUILD]/goma",
"--",
- "aura_builder"
+ "base_unittests_apk"
],
"name": "compile",
"seed_steps": [
"compile",
"checkdeps",
- "package build"
+ "check_licenses"
]
},
{
@@ -165,19 +166,49 @@
},
{
"cmd": [
+ "[SLAVE_BUILD]/src/android_webview/tools/webview_licenses.py",
+ "scan"
+ ],
+ "env": {
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ },
+ "name": "check_licenses"
+ },
+ {
+ "cmd": [
+ "[SLAVE_BUILD]/src/build/android/findbugs_diff.py",
+ "--release-build"
+ ],
+ "env": {
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ },
+ "name": "findbugs"
+ },
+ {
+ "cmd": [
+ "[SLAVE_BUILD]/src/tools/android/findbugs_plugin/test/run_findbugs_plugin_tests.py",
+ "--release-build"
+ ],
+ "env": {
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ },
+ "name": "findbugs_tests"
+ },
+ {
+ "cmd": [
"python",
"-u",
"[BUILD]/scripts/slave/zip_build.py",
"--target",
"Release",
"--build-url",
- "gs://chromium-chromiumos-archive/chromium.chromiumos/Linux ChromiumOS Builder",
+ "gs://chromium-linux-archive/chromium.linux/Android Builder",
"--build_revision",
"170242",
"--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Linux ChromiumOS Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.chromiumos\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
"--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Linux ChromiumOS Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.chromiumos\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
],
"name": "package build"
}

Powered by Google App Engine
This is Rietveld 408576698