commit 8916d3a8ad0056603bfd8b37df1d50ff7700d5d6
author Ryan Campbell <ryanjcampbell@google.com> Wed Aug 02 00:06:26 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 02 00:06:26 2017 +0000
tree 5e21a5ab656eb5c6ab04d4ab845c573517d9aefe
parent f910a6efd82c4c36f6f048678486e6467a44d589
parent ae0e2fc891a44afbb09a94e39b5d4d131342e3e9

Merge "Add support for coverage flushing."
am: ae0e2fc891

Change-Id: I0895c9a91e84b59a02f3f3034c3de75d3ea9826e

base/HidlInternal.cpp

diff --git a/base/HidlInternal.cpp b/base/HidlInternal.cpp
index b0d867f..5fae1c4 100644
--- a/base/HidlInternal.cpp
+++ b/base/HidlInternal.cpp
@@ -25,13 +25,16 @@
 #include <dirent.h>
 #include <dlfcn.h>
 #include <regex>
+#include <utils/misc.h>
+
+extern "C" __attribute__((weak)) void __sanitizer_cov_dump();
 #endif
 
 namespace android {
 namespace hardware {
 namespace details {
 
-void logAlwaysFatal(const char *message) {
+void logAlwaysFatal(const char* message) {
     LOG(FATAL) << message;
 }
 
@@ -42,9 +45,21 @@
       mInstrumentationLibPackage(package),
       mInterfaceName(interface) {
     configureInstrumentation(false);
+#ifdef LIBHIDL_TARGET_DEBUGGABLE
+    if (__sanitizer_cov_dump != nullptr) {
+        ::android::add_sysprop_change_callback(
+            []() {
+                bool enableCoverage = property_get_bool("hal.coverage.enable", false);
+                if (enableCoverage) {
+                    __sanitizer_cov_dump();
+                }
+            },
+            0);
+    }
+#endif
 }
 
-HidlInstrumentor:: ~HidlInstrumentor() {}
+HidlInstrumentor::~HidlInstrumentor() {}
 
 void HidlInstrumentor::configureInstrumentation(bool log) {
     bool enableInstrumentation = property_get_bool(