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

Unified Diff: infra/bots/recipes/swarm_compile.py

Issue 2352653002: GN: remove old Android recipe code. (Closed)
Patch Set: missing json Created 4 years, 3 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: infra/bots/recipes/swarm_compile.py
diff --git a/infra/bots/recipes/swarm_compile.py b/infra/bots/recipes/swarm_compile.py
index 750d2dbfef1c71e46468771d5c202fc4ac3d621d..ddf05f8451391a43a7f150ff3dced90f0820a73d 100644
--- a/infra/bots/recipes/swarm_compile.py
+++ b/infra/bots/recipes/swarm_compile.py
@@ -22,7 +22,6 @@ DEPS = [
TEST_BUILDERS = {
'client.skia.compile': {
'skiabot-linux-swarm-000': [
- 'Build-Mac-Clang-Arm7-Debug-Android',
'Build-Mac-Clang-Arm7-Release-iOS',
'Build-Mac-Clang-mipsel-Debug-GN_Android',
'Build-Mac-Clang-x86_64-Debug-CommandBuffer',
@@ -32,11 +31,8 @@ TEST_BUILDERS = {
'Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan',
'Build-Ubuntu-Clang-x86_64-Debug-ASAN',
'Build-Ubuntu-Clang-x86_64-Debug-GN',
- 'Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot',
- 'Build-Ubuntu-GCC-Arm7-Debug-Android_FrameworkDefs',
- 'Build-Ubuntu-GCC-Arm7-Debug-Android_NoNeon',
- 'Build-Ubuntu-GCC-Arm7-Release-Android',
- 'Build-Ubuntu-GCC-Arm7-Release-Android_Vulkan',
+ 'Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot',
+ 'Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs',
'Build-Ubuntu-GCC-x86-Debug',
'Build-Ubuntu-GCC-x86_64-Debug-GN',
'Build-Ubuntu-GCC-x86_64-Debug-MSAN',
@@ -168,10 +164,6 @@ def get_gyp_defines(builder_dict):
builder_dict.get('cpu_or_gpu_value') == 'Mesa'):
gyp_defs['skia_mesa'] = '1'
- # skia_use_android_framework_defines.
- if builder_dict.get('extra_config') == 'Android_FrameworkDefs':
- gyp_defs['skia_use_android_framework_defines'] = '1'
-
# CommandBuffer.
if builder_dict.get('extra_config') == 'CommandBuffer':
gyp_defs['skia_command_buffer'] = '1'
@@ -248,14 +240,6 @@ def GenTests(api):
test += api.platform('mac', 64)
else:
test += api.platform('linux', 64)
- if 'Android' in builder and 'GN' not in builder:
- ccache = '/usr/bin/ccache'
- test += api.step_data('has ccache?',
- stdout=api.json.output({'ccache':ccache}))
- if 'Android' in builder and 'GN_Android' not in builder:
- test += api.step_data(
- 'which adb',
- retcode=1)
if 'Trybot' in builder:
test += api.properties(issue=500,
patchset=1,

Powered by Google App Engine
This is Rietveld 408576698