From abe9034bcfec6e31fe01100982e5a0fcc49ab597 Mon Sep 17 00:00:00 2001 From: Rafal Augustyniak Date: Tue, 26 Apr 2022 16:50:44 -0400 Subject: [PATCH 1/2] Revert "bazel: include debug info in Android release binary (#2188)" This reverts commit 485f4275dcab3b7bd0f4fedd42768af4aee94ccd. Signed-off-by: Rafal Augustyniak --- .bazelrc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.bazelrc b/.bazelrc index 98350008f9..5f3d2e407c 100644 --- a/.bazelrc +++ b/.bazelrc @@ -76,6 +76,10 @@ build:tsan-dev --copt -DEVENT__DISABLE_DEBUG_MODE # https://github.com/google/sanitizers/issues/953 build:tsan-dev --test_env="TSAN_OPTIONS=report_atomic_races=0" +# Exclude debug info from the release binary since it makes it too large to fit +# into a zip file. This shouldn't affect crash reports. +build:release-common --define=no_debug_info=1 + # Compile releases optimizing for size (eg -Os, etc). build:release-common --config=sizeopt @@ -88,11 +92,6 @@ build:release-ios --config=ios build:release-ios --config=release-common build:release-ios --copt=-fembed-bitcode build:release-ios --compilation_mode=opt -# Exclude debug info from the release binary since it makes it too large to fit -# into a zip file. This shouldn't affect iOS crash reports. We do not define it for Android -# builds as it leads to a removal of relevant symbols from Android binaries (and -# corresponding objdump files). -build:release-ios --define=no_debug_info=1 # Flags for release builds targeting Android or the JVM # Release does not use the option --define=logger=android From 733a5a4b8d63a896b7cbfc7f32c1aad7cbbb33ea Mon Sep 17 00:00:00 2001 From: Rafal Augustyniak Date: Tue, 26 Apr 2022 16:50:51 -0400 Subject: [PATCH 2/2] Revert "bazel: create symbol mapping file (#2126)" This reverts commit f955257e940b7bf3a9f4463fd2f061d3eea6f6ea. Signed-off-by: Rafal Augustyniak --- bazel/android_debug_info.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bazel/android_debug_info.bzl b/bazel/android_debug_info.bzl index c6b785ea4e..30a446787a 100644 --- a/bazel/android_debug_info.bzl +++ b/bazel/android_debug_info.bzl @@ -25,9 +25,9 @@ def _impl(ctx): ctx.actions.run_shell( inputs = [lib], outputs = [objdump_output], - command = cc_toolchain.objdump_executable + " --dwarf=info --dwarf=rawline " + lib.path + "| gzip -c >" + objdump_output.path, + command = cc_toolchain.objdump_executable + " --syms " + lib.path + "| gzip -c >" + objdump_output.path, tools = [cc_toolchain.all_files], - progress_message = "Generating symbol mapping file " + platform_name, + progress_message = "Generating symbol map " + platform_name, ) strip_output = ctx.actions.declare_file(platform_name + "/" + lib.basename)