Snap for 7497336 from 08f3555cabd9f5cc4f4f896400a0cc663e21eddd to sc-d2-release

Change-Id: If7535334be546b7510b5f4c4c1aa38a1bb880106

2 files changed, 7 insertions, 17 deletions

diff --git a/toolchain-extras/Android.bp b/toolchain-extras/Android.bp
index 007817ec..220f3e34 100644
--- a/toolchain-extras/Android.bp
+++ b/toolchain-extras/Android.bp
@@ -129,11 +129,10 @@ cc_test {
     srcs: [
         "profile-clang-extras-test.cpp",
     ],
-    static_libs: [
+    whole_static_libs: [
         "libprofile-clang-extras",
     ],
     ldflags: [
-        "-uinit_profile_extras",
         "-Wl,--wrap,open",
     ],
     native_coverage: false,
diff --git a/toolchain-extras/profile-clang-extras.cpp b/toolchain-extras/profile-clang-extras.cpp
index 89c18b2a..bb713e18 100644
--- a/toolchain-extras/profile-clang-extras.cpp
+++ b/toolchain-extras/profile-clang-extras.cpp
@@ -36,24 +36,15 @@ static void llvm_signal_handler(__unused int signum) {
   }
 }
 
-__attribute__((weak)) int init_profile_extras_once = 0;
-
 // Initialize libprofile-extras:
-// - Install a signal handler that triggers __llvm_profile_write_file on <COVERAGE_FLUSH_SIGNAL>.
-//
-// We want this initializer to run during load time.
 //
-// Just marking init_profile_extras() with __attribute__((constructor)) isn't
-// enough since the linker drops it from its output since no other symbol from
-// this static library is referenced.
+// - Install a signal handler that triggers __llvm_profile_write_file on
+// <COVERAGE_FLUSH_SIGNAL>.
 //
-// We force the linker to include init_profile_extras() by passing
-// '-uinit_profile_extras' to the linker (in build/soong).
-__attribute__((constructor)) int init_profile_extras(void) {
-  if (init_profile_extras_once)
-    return 0;
-  init_profile_extras_once = 1;
-
+// We want this initializer to run during load time.  In addition to marking
+// this function as a constructor, we link this library with `--whole-archive`
+// to force this function to be included in the output.
+static __attribute__((constructor)) int init_profile_extras(void) {
   if (chained_signal_handler != SIG_ERR) {
     return -1;
   }