commit 6365a875fe6d75b354f74bf292f0a3c8cf448c79
author Dan Willemsen <dwillemsen@google.com> Tue Sep 13 16:29:54 2016 -0700
committer Dan Willemsen <dwillemsen@google.com> Mon Sep 26 13:17:08 2016 -0700
tree 4c26c7cf58f4fa04f6978fa39d419f11c5b8c1a4
parent 62bb7a093fed1b75e398d333fe599a3568955e27

Convert to Android.bp

See build/soong/README.md for more information.

Bug: 31742855
Test: mma -j
Change-Id: Ib0ca1e78542181099841d3e2126490e4f0670d49

HidlSupport.cpp

diff --git a/HidlSupport.cpp b/HidlSupport.cpp
index 37d4b9f..5307770 100644
--- a/HidlSupport.cpp
+++ b/HidlSupport.cpp
@@ -16,7 +16,7 @@
 
 #include <hidl/HidlSupport.h>
 
-#ifndef DLIBHIDL_TARGET_BUILD_VARIANT_USER
+#ifdef LIBHIDL_TARGET_DEBUGGABLE
 #include <android-base/logging.h>
 #include <cutils/properties.h>
 #include <regex>
@@ -127,7 +127,7 @@
 void registerInstrumentationCallbacks(
         const std::string &profilerPrefix,
         std::vector<InstrumentationCallback> *instrumentationCallbacks) {
-#ifndef DLIBHIDL_TARGET_BUILD_VARIANT_USER
+#ifdef LIBHIDL_TARGET_DEBUGGABLE
     std::vector<std::string> instrumentationLibPaths;
     instrumentationLibPaths.push_back(HAL_LIBRARY_PATH_SYSTEM);
     instrumentationLibPaths.push_back(HAL_LIBRARY_PATH_VENDOR);
@@ -180,12 +180,11 @@
 bool isInstrumentationLib(
         const std::string &profiler_prefix,
         const dirent *file) {
-#ifndef DLIBHIDL_TARGET_BUILD_VARIANT_USER
+#ifdef LIBHIDL_TARGET_DEBUGGABLE
     if (file->d_type != DT_REG) return false;
     std::cmatch cm;
     std::regex e("^" + profiler_prefix + "(.*).profiler.so$");
     if (std::regex_match(file->d_name, cm, e)) return true;
-#else
 #endif
     return false;
 }