commit 6a9e5560af4df421bae18f28c65309e51ebc9a8d
author Logan Chien <loganchien@google.com> Tue Oct 23 23:03:20 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 23 23:03:20 2018 -0700
tree d9ca0daf74a7ba974abc33922ff46a885de7508f
parent f8a44031e08a232898479f956b92f03edc9a921c
parent cb59e24764b6866e252b3710c1752f2983013142

Use static linkage to reduce user/userdebug differences am: 73fe94d196 am: e07ac3a0f5
am: cb59e24764

Change-Id: I3cd2fa66e930b6d3b012bb388350e7c62fd81891

base/HidlInternal.cpp

diff --git a/base/HidlInternal.cpp b/base/HidlInternal.cpp
index 81b353d..440b30f 100644
--- a/base/HidlInternal.cpp
+++ b/base/HidlInternal.cpp
@@ -31,16 +31,17 @@
 #include <regex>
 
 extern "C" __attribute__((weak)) void __sanitizer_cov_dump();
-const char* kGcovPrefixEnvVar = "GCOV_PREFIX";
-const char* kGcovPrefixOverrideEnvVar = "GCOV_PREFIX_OVERRIDE";
-const char* kGcovPrefixPath = "/data/misc/trace/";
-const char* kSysPropHalCoverage = "hal.coverage.enable";
+
+const char kGcovPrefixEnvVar[] = "GCOV_PREFIX";
+const char kGcovPrefixOverrideEnvVar[] = "GCOV_PREFIX_OVERRIDE";
+const char kGcovPrefixPath[] = "/data/misc/trace/";
+const char kSysPropHalCoverage[] = "hal.coverage.enable";
 #if defined(__LP64__)
-const char* kSysPropInstrumentationPath = "hal.instrumentation.lib.path.64";
+const char kSysPropInstrumentationPath[] = "hal.instrumentation.lib.path.64";
 #else
-const char* kSysPropInstrumentationPath = "hal.instrumentation.lib.path.32";
+const char kSysPropInstrumentationPath[] = "hal.instrumentation.lib.path.32";
 #endif
-#endif
+#endif  // LIBHIDL_TARGET_DEBUGGABLE
 
 namespace android {
 namespace hardware {