Commit ecc84c51 authored by Hans Wennborg's avatar Hans Wennborg Committed by Commit Bot

mb: Use KitKat Phone Tester (rel)'s build config for ToTAndroid

The KitKat Phone Tester config is used by the linux_android_rel_ng CQ bot.
ToTAndroid now runs the same tests as that bot, but they don't pass due to
build config differences.

It would of course be nice if the tests passed without the official codecs etc.
but that shouldn't be a distraction from keeping the ToT bots green in the
config tested by the CQ.

Bug: 817298
Change-Id: I4b89d6c050d39038af8faddbd4225b394048b1f7
Reviewed-on: https://chromium-review.googlesource.com/992234Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Commit-Queue: Hans Wennborg <hans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#547701}
parent c52e741c
...@@ -126,11 +126,10 @@ ...@@ -126,11 +126,10 @@
'CrWinClngLLD64dbg': 'clang_tot_full_symbols_shared_debug_use_lld', 'CrWinClngLLD64dbg': 'clang_tot_full_symbols_shared_debug_use_lld',
'CrWinClngLLDdbg': 'clang_tot_full_symbols_shared_debug_use_lld_x86', 'CrWinClngLLDdbg': 'clang_tot_full_symbols_shared_debug_use_lld_x86',
'linux-win_cross-rel': 'clang_tot_win_release_cross', 'linux-win_cross-rel': 'clang_tot_win_release_cross',
'ToTAndroid': 'android_clang_tot_release', 'ToTAndroid': 'android_clang_tot_release_minimal_symbols',
'ToTAndroid64': 'android_clang_tot_release_arm64', 'ToTAndroid64': 'android_clang_tot_release_arm64',
'ToTAndroidASan': 'android_clang_tot_asan', 'ToTAndroidASan': 'android_clang_tot_asan',
'ToTAndroid (dbg)': 'android_clang_tot_dbg', 'ToTAndroid (dbg)': 'android_clang_tot_dbg',
'ToTAndroid': 'android_clang_tot_release',
'ToTAndroidCFI': 'android_clang_tot_cfi_full_cfi_diag_thin_lto_release_static_dcheck_always_on', 'ToTAndroidCFI': 'android_clang_tot_cfi_full_cfi_diag_thin_lto_release_static_dcheck_always_on',
'ToTAndroid64': 'android_clang_tot_release_arm64', 'ToTAndroid64': 'android_clang_tot_release_arm64',
'ToTAndroid x64': 'android_clang_tot_x64', 'ToTAndroid x64': 'android_clang_tot_x64',
...@@ -812,10 +811,6 @@ ...@@ -812,10 +811,6 @@
'android_without_codecs', 'clang_tot', 'shared', 'debug', 'android_without_codecs', 'clang_tot', 'shared', 'debug',
], ],
'android_clang_tot_release': [
'android_without_codecs', 'clang_tot', 'release',
],
'android_clang_tot_release_arm64': [ 'android_clang_tot_release_arm64': [
'android_without_codecs', 'clang_tot', 'release', 'arm64', 'android_without_codecs', 'clang_tot', 'release', 'arm64',
], ],
...@@ -964,6 +959,11 @@ ...@@ -964,6 +959,11 @@
'strip_debug_info', 'strip_debug_info',
], ],
'android_clang_tot_release_minimal_symbols': [
'android', 'release', 'static', 'minimal_symbols',
'strip_debug_info', 'clang_tot',
],
'android_release_bot_minimal_symbols_arm64': [ 'android_release_bot_minimal_symbols_arm64': [
'android', 'release_bot', 'minimal_symbols', 'arm64', 'android', 'release_bot', 'minimal_symbols', 'arm64',
'strip_debug_info', 'strip_debug_info',
......
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