commit f8802e5f0a74caf51897b7dd51412ae7d04d0fe8
author Jiyong Park <jiyong@google.com> Fri May 03 16:34:56 2019 +0900
committer Jiyong Park <jiyong@google.com> Wed May 08 13:49:49 2019 +0900
tree 9f6f0df185d2c1424cfe7158393229a1f64e66da
parent 40a6077244e22b5f3ab96358210b636618d4121a

Introduce utils.h

Introduce utils.h to have common routines.

Bug: 130388701
Test: build & pass presubmit tests
Change-Id: Ic40da64fefc1f2216bdea9ea93a15e5abb8f23a4

libnativeloader/public_libraries.cpp

diff --git a/libnativeloader/public_libraries.cpp b/libnativeloader/public_libraries.cpp
index 8e3f9e8..e6f8448e 100644
--- a/libnativeloader/public_libraries.cpp
+++ b/libnativeloader/public_libraries.cpp
@@ -27,6 +27,7 @@
 #include "android-base/properties.h"
 #include "android-base/strings.h"
 #include "log/log.h"
+#include "utils.h"
 
 namespace android::nativeloader {
 
@@ -50,12 +51,7 @@
     "libicui18n.so",
 };
 
-// TODO(b/130388701) use macro LIB to eliminate the conditional
-#if defined(__LP64__)
-constexpr const char* kRuntimeApexLibPath = "/apex/com.android.runtime/lib64";
-#else
-constexpr const char* kRuntimeApexLibPath = "/apex/com.android.runtime/lib";
-#endif
+constexpr const char* kRuntimeApexLibPath = "/apex/com.android.runtime/" LIB;
 
 std::string root_dir() {
   static const char* android_root_env = getenv("ANDROID_ROOT");