diff options
author | Mike Klein <mtklein@chromium.org> | 2018-05-25 14:29:51 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-25 18:55:42 +0000 |
commit | 6857df77b06c6e5be2409926bf1901349f5466d0 (patch) | |
tree | ecf27d1564601fb2aacd799b5e8918cce60b7be8 /infra/bots/recipe_modules | |
parent | 975c93194cc825b27846a9a3f3832c1f4c989f18 (diff) |
remove EmbededResouces bot
The skia_embed_resoucres flag in GN is gone.
(Both misspellings sic, seriously.)
Change-Id: Ic4424fcea264010ff1cce390b4fd260897c15677
Reviewed-on: https://skia-review.googlesource.com/130147
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'infra/bots/recipe_modules')
3 files changed, 0 insertions, 91 deletions
diff --git a/infra/bots/recipe_modules/build/default.py b/infra/bots/recipe_modules/build/default.py index 5aba543f19..cb98d21e21 100644 --- a/infra/bots/recipe_modules/build/default.py +++ b/infra/bots/recipe_modules/build/default.py @@ -193,8 +193,6 @@ def compile_fn(api, checkout_root, out_dir): }) if 'NoGPU' in extra_tokens: args['skia_enable_gpu'] = 'false' - if 'EmbededResouces' in extra_tokens: - args['skia_embed_resoucres'] = 'true' if 'Shared' in extra_tokens: args['is_component_build'] = 'true' if 'Vulkan' in extra_tokens and not 'Android' in extra_tokens: diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Debug-EmbededResouces.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Debug-EmbededResouces.json deleted file mode 100644 index 58be38fa0a..0000000000 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Debug-EmbededResouces.json +++ /dev/null @@ -1,88 +0,0 @@ -[ - { - "cmd": [ - "python", - "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" - ], - "cwd": "[START_DIR]/cache/work/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "fetch-gn" - }, - { - "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn", - "gen", - "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Debug-EmbededResouces/Debug", - "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\"] skia_embed_resoucres=true target_cpu=\"x86_64\"" - ], - "cwd": "[START_DIR]/cache/work/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "gn gen" - }, - { - "cmd": [ - "ninja", - "-k", - "0", - "-C", - "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Debug-EmbededResouces/Debug" - ], - "cwd": "[START_DIR]/cache/work/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "ninja" - }, - { - "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 = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\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", - "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Debug-EmbededResouces/Debug", - "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" - ], - "infra_step": true, - "name": "copy build products", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@import errno@@@", - "@@@STEP_LOG_LINE@python.inline@import glob@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import shutil@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@", - "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@", - "@@@STEP_LOG_LINE@python.inline@ raise@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@", - "@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@", - "@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@", - "@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@", - "@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/build/examples/full.py b/infra/bots/recipe_modules/build/examples/full.py index 3868898475..5f686ada7c 100644 --- a/infra/bots/recipe_modules/build/examples/full.py +++ b/infra/bots/recipe_modules/build/examples/full.py @@ -43,7 +43,6 @@ TEST_BUILDERS = [ 'Build-Debian9-EMCC-wasm-Release', 'Build-Debian9-GCC-arm-Release-Chromecast', 'Build-Debian9-GCC-loongson3a-Release', - 'Build-Debian9-GCC-x86_64-Debug-EmbededResouces', 'Build-Debian9-GCC-x86_64-Release-ANGLE', 'Build-Debian9-GCC-x86_64-Release-Flutter_Android', 'Build-Debian9-GCC-x86_64-Release-NoGPU', |