summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-03-07 19:38:56 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-07 19:38:56 +0000
commitb6ee567990514486c5bc006144feb37d294afee5 (patch)
tree8b7b43a2487f84cafa914e2d68ad64410d2cdadc
parent222f19d560304712474c6db34a10497b43efe864 (diff)
parent80d4eced69f4d1e9f9ef97b5f4f26868cd76ae26 (diff)
downloadlibhardware-b6ee567990514486c5bc006144feb37d294afee5.tar.gz
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
-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