commit 6c8ad5aa80a12c5a76cf22d5b87097ee5d950c62
author Colin Cross <ccross@android.com> Sun Feb 16 18:42:54 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sun Feb 16 18:42:54 2014 +0000
tree e5d2f2011af991711e50092fa5b0b0710b6e20a1
parent b1d5760b08c0116f3e5cf33e21a4ff710cd3d7a4
parent 80d4eced69f4d1e9f9ef97b5f4f26868cd76ae26

am 80d4eced: Merge "Use /(vendor|system)/lib64/hw for 64-bit HAL libraries"

* commit '80d4eced69f4d1e9f9ef97b5f4f26868cd76ae26':
  Use /(vendor|system)/lib64/hw for 64-bit HAL libraries

hardware.c

diff --git a/hardware.c b/hardware.c
index f835fda..6713ea0 100644
--- a/hardware.c
+++ b/hardware.c
@@ -28,8 +28,13 @@
 #include <utils/Log.h>
 
 /** Base path of the hal modules */
+#if defined(__LP64__)
+#define HAL_LIBRARY_PATH1 "/system/lib64/hw"
+#define HAL_LIBRARY_PATH2 "/vendor/lib64/hw"
+#else
 #define HAL_LIBRARY_PATH1 "/system/lib/hw"
 #define HAL_LIBRARY_PATH2 "/vendor/lib/hw"
+#endif
 
 /**
  * There are a set of variant filename for modules. The form of the filename