Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
diff --git a/halimpl/pn54x/common/phNfcCommon.h b/halimpl/pn54x/common/phNfcCommon.h
index 638a133..521e4ed 100644
--- a/halimpl/pn54x/common/phNfcCommon.h
+++ b/halimpl/pn54x/common/phNfcCommon.h
@@ -33,7 +33,7 @@
#include <pthread.h>
#include <semaphore.h>
-#define FW_DLL_ROOT_DIR "/system/vendor/firmware/"
+#define FW_DLL_ROOT_DIR "/system/vendor/lib/"
#define FW_DLL_EXTENSION ".so"
#if (NFC_NXP_CHIP_TYPE == PN548C2)
diff --git a/halimpl/pn54x/dnld/phDnldNfc.c b/halimpl/pn54x/dnld/phDnldNfc.c
index 0848d0b..3c659f1 100644
--- a/halimpl/pn54x/dnld/phDnldNfc.c
+++ b/halimpl/pn54x/dnld/phDnldNfc.c
@@ -970,13 +970,13 @@
void* pImageInfoLen = NULL;
if (pathName == NULL) {
#if (NFC_NXP_CHIP_TYPE == PN548C2)
- pathName = "/system/vendor/firmware/libpn548ad_fw.so";
+ pathName = "/system/vendor/lib/libpn548ad_fw.so";
#elif (NFC_NXP_CHIP_TYPE == PN551)
- pathName = "/system/vendor/firmware/libpn551_fw.so";
+ pathName = "/system/vendor/lib/libpn551_fw.so";
#elif (NFC_NXP_CHIP_TYPE == PN553)
- pathName = "/system/vendor/firmware/libpn553_fw.so";
+ pathName = "/system/vendor/lib/libpn553_fw.so";
#else
- pathName = "/system/vendor/firmware/libpn547_fw.so";
+ pathName = "/system/vendor/lib/libpn547_fw.so";
#endif
}
@@ -1043,13 +1043,13 @@
/* check for path name */
if (pathName == NULL) {
#if (NFC_NXP_CHIP_TYPE == PN548C2)
- pathName = "/system/vendor/firmware/libpn548ad_fw.so";
+ pathName = "/system/vendor/lib/libpn548ad_fw.so";
#elif (NFC_NXP_CHIP_TYPE == PN551)
- pathName = "/system/vendor/firmware/libpn551_fw.so";
+ pathName = "/system/vendor/lib/libpn551_fw.so";
#elif (NFC_NXP_CHIP_TYPE == PN553)
- pathName = "/system/vendor/firmware/libpn553_fw.so";
+ pathName = "/system/vendor/lib/libpn553_fw.so";
#else
- pathName = "/system/vendor/firmware/libpn547_fw.so";
+ pathName = "/system/vendor/lib/libpn547_fw.so";
#endif
}
diff --git a/halimpl/pn54x/libnfc-brcm.conf b/halimpl/pn54x/libnfc-brcm.conf
index c1dfe47..9132d0c 100644
--- a/halimpl/pn54x/libnfc-brcm.conf
+++ b/halimpl/pn54x/libnfc-brcm.conf
@@ -191,12 +191,12 @@
###############################################################################
# Firmware patch file
# If the value is not set then patch download is disabled.
-#FW_PATCH="/vendor/firmware/bcm2079x_firmware.ncd"
+#FW_PATCH="/vendor/lib/bcm2079x_firmware.ncd"
###############################################################################
# Firmware pre-patch file (sent before the above patch file)
# If the value is not set then pre-patch is not used.
-#FW_PRE_PATCH="/vendor/firmware/bcm2079x_pre_firmware.ncd"
+#FW_PRE_PATCH="/vendor/lib/bcm2079x_pre_firmware.ncd"
###############################################################################
# Firmware patch format
diff --git a/halimpl/pn54x/libnfc-brcm_NCI2_0.conf b/halimpl/pn54x/libnfc-brcm_NCI2_0.conf
index 919964a..a6f36ac 100644
--- a/halimpl/pn54x/libnfc-brcm_NCI2_0.conf
+++ b/halimpl/pn54x/libnfc-brcm_NCI2_0.conf
@@ -191,12 +191,12 @@
###############################################################################
# Firmware patch file
# If the value is not set then patch download is disabled.
-#FW_PATCH="/vendor/firmware/bcm2079x_firmware.ncd"
+#FW_PATCH="/vendor/lib/bcm2079x_firmware.ncd"
###############################################################################
# Firmware pre-patch file (sent before the above patch file)
# If the value is not set then pre-patch is not used.
-#FW_PRE_PATCH="/vendor/firmware/bcm2079x_pre_firmware.ncd"
+#FW_PRE_PATCH="/vendor/lib/bcm2079x_pre_firmware.ncd"
###############################################################################
# Firmware patch format
