summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-02-16 18:40:01 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-02-16 18:40:01 +0000
commit80d4eced69f4d1e9f9ef97b5f4f26868cd76ae26 (patch)
tree9fab5797fb5f8979cabe610acb5eb3624d449621
parentf77bd7d005e27364e233c92ac7f6c06a18d1f128 (diff)
parent86389d10801bce4bff457f602f1cb686df513dfb (diff)
downloadlibhardware-80d4eced69f4d1e9f9ef97b5f4f26868cd76ae26.tar.gz
Merge "Use /(vendor|system)/lib64/hw for 64-bit HAL libraries"
-rw-r--r--hardware.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/hardware.c b/hardware.c
index f835fdac..6713ea01 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