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

* commit '6c8ad5aa80a12c5a76cf22d5b87097ee5d950c62':
  Use /(vendor|system)/lib64/hw for 64-bit HAL libraries
This commit is contained in:
Colin Cross 2014-02-16 18:47:57 +00:00 committed by Android Git Automerger
commit 23e41654e2

View file

@ -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