Commit 9117519e authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Revert "Restore CQ coverage for proguard, errorprone and lint"

This reverts commit 5e31951c.

Reason for revert: Broke monochrome_apk_checker on android-pie-arm64-rel

Original change's description:
> Restore CQ coverage for proguard, errorprone and lint
> 
> * Removes these from android-pie-arm64-rel (currently offline).
> * Adds proguard to android-marshmallow-arm64-rel
> * Adds errorprone & lint to android-lollipop-arm-rel
> 
> Spread across two different bots to share the load.
> 
> Bug: 1111436
> Change-Id: Ieac924ccae06aa4bc01b52bf795d1a174616a799
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2342575
> Reviewed-by: Ben Pastene <bpastene@chromium.org>
> Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
> Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#796688}

TBR=agrieve@chromium.org,bpastene@chromium.org,mheikal@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1111436, 1115164
Change-Id: I81ee42d31410176e157be2edced7b5eb4fb25025
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2354449Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#797720}
parent b2e3f81c
......@@ -94,15 +94,15 @@
'android-cronet-x86-dbg': 'android_cronet_debug_static_bot_x86',
'android-cronet-x86-rel': 'android_cronet_release_bot_minimal_symbols_x86',
'android-incremental-dbg': 'android_incremental_debug_bot',
'android-lollipop-arm-rel': 'android_release_bot_minimal_symbols_webview_google',
'android-lollipop-arm-rel': 'android_release_bot_minimal_symbols_fastbuild_webview_google',
# This bot must use the gpu_tests mixin to match 'Android FYI Release (Nexus 5X)'
# on the chromium.gpu waterfall, which it mirrors via trybots.pyl.
'android-marshmallow-arm64-rel': 'gpu_tests_android_release_bot_minimal_symbols_arm64',
'android-marshmallow-arm64-rel': 'gpu_tests_android_release_bot_minimal_symbols_arm64_fastbuild',
'android-marshmallow-x86-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_resource_whitelisting_webview_google',
'android-nougat-arm64-rel': 'android_release_bot_minimal_symbols_arm64_fastbuild_webview_google',
'android-pie-arm64-rel': 'android_release_bot_minimal_symbols_arm64_webview_google_fastbuild',
'android-pie-arm64-rel': 'android_release_bot_minimal_symbols_arm64_webview_google',
'android-pie-x86-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_google',
'android-10-arm64-rel': 'android_release_bot_minimal_symbols_arm64_fastbuild_webview_google',
},
......@@ -550,10 +550,10 @@
'chromium.dev': {
# This should be the same with 'android-lollipop-arm-rel'.
'android-lollipop-arm-rel-swarming': 'android_release_bot_minimal_symbols_webview_google',
'android-lollipop-arm-rel-swarming': 'android_release_bot_minimal_symbols_fastbuild_webview_google',
# This should be the same with 'android-marshmallow-arm64-rel'.
'android-marshmallow-arm64-rel-swarming': 'gpu_tests_android_release_bot_minimal_symbols_arm64',
'android-marshmallow-arm64-rel-swarming': 'gpu_tests_android_release_bot_minimal_symbols_arm64_fastbuild',
# These should be the same with 'Linux Builder'.
'linux-rel-swarming': 'gpu_tests_release_bot',
......@@ -707,7 +707,7 @@
# TODO(crbug/597596): Switch this back to debug_trybot when cronet's
# shared library loading is fixed.
'android-cronet-arm-dbg': 'android_cronet_debug_static_bot_arm_no_neon',
'android-lollipop-arm-rel': 'android_release_trybot_webview_google',
'android-lollipop-arm-rel': 'android_release_trybot_fastbuild_webview_google',
'android-marshmallow-arm64-rel': 'gpu_tests_android_release_trybot_arm64_resource_whitelisting_fastbuild_java_coverage',
'android-marshmallow-x86-fyi-rel': 'android_release_trybot_x86_fastbuild_resource_whitelisting_webview_google',
'android-marshmallow-x86-rel': 'android_release_trybot_x86_fastbuild_resource_whitelisting_webview_google',
......@@ -1259,15 +1259,9 @@
'strip_debug_info', 'webview_google',
],
'android_release_bot_minimal_symbols_arm64_webview_google_fastbuild': [
'android', 'release_bot', 'minimal_symbols', 'arm64',
'strip_debug_info', 'webview_google', 'android_fastbuild',
'android_no_proguard',
],
'android_release_bot_minimal_symbols_webview_google': [
'android_release_bot_minimal_symbols_fastbuild_webview_google': [
'android', 'release_bot', 'minimal_symbols',
'strip_debug_info', 'webview_google',
'strip_debug_info', 'android_fastbuild', 'webview_google',
],
'android_release_bot_minimal_symbols_x86_fastbuild_resource_whitelisting_webview_google': [
......@@ -1309,9 +1303,9 @@
'use_clang_coverage', 'partial_code_coverage_instrumentation',
],
'android_release_trybot_webview_google': [
'android', 'release_trybot', 'strip_debug_info', 'android_no_proguard',
'webview_google',
'android_release_trybot_fastbuild_webview_google': [
'android', 'release_trybot', 'strip_debug_info', 'android_fastbuild',
'android_no_proguard', 'webview_google',
],
'android_release_trybot_x86_fastbuild_resource_whitelisting_webview_google': [
......@@ -1820,9 +1814,10 @@
'gpu_fyi_tests', 'release_trybot', 'x86',
],
'gpu_tests_android_release_bot_minimal_symbols_arm64': [
'gpu_tests_android_release_bot_minimal_symbols_arm64_fastbuild': [
'gpu_tests', 'android', 'release_bot', 'minimal_symbols', 'arm64',
'resource_whitelisting', 'static_angle', 'webview_google',
'resource_whitelisting', 'static_angle', 'android_fastbuild', 'webview_google',
'android_no_proguard',
],
'gpu_tests_android_release_bot_minimal_symbols_arm64_fastbuild_java_coverage': [
......@@ -1854,6 +1849,7 @@
'gpu_tests_android_release_trybot_arm64_resource_whitelisting_fastbuild_java_coverage': [
'gpu_tests', 'android', 'release_trybot', 'arm64', 'static_angle',
'resource_whitelisting', 'android_fastbuild', 'webview_google',
'android_no_proguard',
'use_java_coverage', 'partial_code_coverage_instrumentation',
],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment