Commit 1eedbd1a authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Fix assert_static_initializers.py crash upon failure

Not a future-proof fix, but at least unbreaks it for now by adding
libcrashpad_handler_trampoline.so to the ignored list.

Crash looks like:
Dumping static initializers via dump-static-initializers.py:
Traceback (most recent call last):
  File "../../build/android/gyp/assert_static_initializers.py", line 174, in <module>
    main()
  File "../../build/android/gyp/assert_static_initializers.py", line 159, in main
    ignored_libs, no_initializers_libs)
  File "../../build/android/gyp/assert_static_initializers.py", line 125, in _AnalyzeStaticInitializers
    _PrintDumpSIsCount(f.filename, temp.name, out_dir, tool_prefix)
  File "../../build/android/gyp/assert_static_initializers.py", line 55, in _PrintDumpSIsCount
    so_with_symbols_path)
Exception: ('Unstripped .so not found. Looked here: %s', './lib.unstripped/libcrashpad_handler_trampoline.so')

Bug: 939207
Change-Id: I3cf6b9ba52d80a789ec5bcd3b8e1943e0a578a3a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2098773
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarPeter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#749329}
parent 2733f907
...@@ -138,7 +138,7 @@ def main(): ...@@ -138,7 +138,7 @@ def main():
args = parser.parse_args() args = parser.parse_args()
# TODO(crbug.com/838414): add support for files included via loadable_modules. # TODO(crbug.com/838414): add support for files included via loadable_modules.
ignored_libs = ['libarcore_sdk_c.so'] ignored_libs = {'libarcore_sdk_c.so', 'libcrashpad_handler_trampoline.so'}
# The chromium linker doesn't have static initializers, which makes the # The chromium linker doesn't have static initializers, which makes the
# regular check throw. It should not have any. # regular check throw. It should not have any.
no_initializers_libs = ['libchromium_android_linker.so'] no_initializers_libs = ['libchromium_android_linker.so']
......
...@@ -13,6 +13,6 @@ if (current_toolchain == default_toolchain && ...@@ -13,6 +13,6 @@ if (current_toolchain == default_toolchain &&
(!is_debug && !using_sanitizer && proprietary_codecs)) { (!is_debug && !using_sanitizer && proprietary_codecs)) {
# Define expectations only for target_cpu covered by trybots. # Define expectations only for target_cpu covered by trybots.
if (target_cpu == "arm" || target_cpu == "arm64") { if (target_cpu == "arm" || target_cpu == "arm64") {
expected_static_initializer_count = 4 expected_static_initializer_count = 2
} }
} }
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