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

2014-02-16 18:40:01 +00:00
parent f77bd7d005 86389d1080
commit 80d4eced69
1 changed files with 5 additions and 0 deletions
--- 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