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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json

Issue 2186553006: GN: use ccache if available and the requested compiler. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: quotes Created 4 years, 5 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 | « infra/bots/recipes/swarm_compile.py ('k') | infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json
diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Debug-Android.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json
similarity index 82%
copy from infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Debug-Android.json
copy to infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json
index a8732de0f9330f58461cc4e7bc175acaa2bfe54f..91ca8c05d7edd051b3ae915e6547af2b0152bbaa 100644
--- a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Debug-Android.json
+++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json
@@ -76,7 +76,7 @@
"-u",
"[CUSTOM_/_B_WORK]/skia/tools/buildbot_spec.py",
"/path/to/tmp/json",
- "Build-Mac-Clang-Arm7-Debug-Android"
+ "Build-Ubuntu-Clang-x86_64-Debug-GN"
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"name": "exec buildbot_spec.py",
@@ -88,23 +88,20 @@
"@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"compiler\": \"Clang\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Android\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"GN\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"Mac\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"Arm7\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_cfg\": \"arm_v7_neon\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@",
"@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@",
"@@@STEP_LOG_LINE@json.output@ ], @@@",
"@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"env\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"CC\": \"/usr/bin/clang\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"CXX\": \"/usr/bin/clang++\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm skia_clang_build=1 skia_warnings_as_errors=0\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_warnings_as_errors=1\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@",
"@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@",
@@ -117,15 +114,17 @@
},
{
"cmd": [
- "which",
- "adb"
+ "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn"
],
- "name": "which adb",
- "stdout": "/path/to/tmp/",
- "~followup_annotations": [
- "step returned non-zero exit code: 1",
- "@@@STEP_EXCEPTION@@@"
- ]
+ "cwd": "[CUSTOM_/_B_WORK]/skia",
+ "env": {
+ "BUILDTYPE": "Debug",
+ "CHROME_HEADLESS": "1",
+ "GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1",
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN"
+ },
+ "name": "fetch-gn"
},
{
"cmd": [
@@ -135,12 +134,10 @@
],
"env": {
"BUILDTYPE": "Debug",
- "CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
- "CXX": "/usr/bin/clang++",
- "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_warnings_as_errors=0",
+ "GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Debug-Android"
+ "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN"
},
"name": "has ccache?",
"stdout": "/path/to/tmp/json",
@@ -164,34 +161,43 @@
},
{
"cmd": [
- "[CUSTOM_/_B_WORK]/skia/platform_tools/android/bin/android_ninja",
- "most",
- "-d",
- "arm_v7_neon",
- "--clang"
+ "gn",
+ "gen",
+ "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN/Debug",
+ "--args=is_debug=true cc=\"/usr/bin/ccache clang\" cxx=\"/usr/bin/ccache clang++\""
+ ],
+ "cwd": "[CUSTOM_/_B_WORK]/skia",
+ "env": {
+ "BUILDTYPE": "Debug",
+ "CHROME_HEADLESS": "1",
+ "GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1",
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN"
+ },
+ "name": "gn_gen"
+ },
+ {
+ "cmd": [
+ "ninja",
+ "-C",
+ "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN/Debug"
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
- "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
- "ANDROID_MAKE_CCACHE": "/usr/bin/ccache",
- "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
- "CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
- "CXX": "/usr/bin/clang++",
- "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_warnings_as_errors=0",
+ "GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_ANDROID_VERBOSE_SETUP": "1",
- "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Debug-Android"
+ "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN"
},
- "name": "build most"
+ "name": "compile most"
},
{
"cmd": [
"python",
"-u",
"import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
- "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Debug-Android/Debug",
+ "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN/Debug",
"[CUSTOM_[SWARM_OUT_DIR]]/out/Debug"
],
"name": "copy build products",
« no previous file with comments | « infra/bots/recipes/swarm_compile.py ('k') | infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698