diff options
| author | Colin Cross <ccross@android.com> | 2014-02-16 18:42:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-16 18:42:54 +0000 |
| commit | 6c8ad5aa80a12c5a76cf22d5b87097ee5d950c62 (patch) | |
| tree | e5d2f2011af991711e50092fa5b0b0710b6e20a1 | |
| parent | b1d5760b08c0116f3e5cf33e21a4ff710cd3d7a4 (diff) | |
| parent | 80d4eced69f4d1e9f9ef97b5f4f26868cd76ae26 (diff) | |
| download | hardware_libhardware-6c8ad5aa80a12c5a76cf22d5b87097ee5d950c62.zip hardware_libhardware-6c8ad5aa80a12c5a76cf22d5b87097ee5d950c62.tar.gz hardware_libhardware-6c8ad5aa80a12c5a76cf22d5b87097ee5d950c62.tar.bz2 | |
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.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -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 |