Snap for 5735642 from 281b39d66c7956d32833e6f2a38a40e51be757d4 to sdk-release
Change-Id: I700a95e103aa0065e6a68984ba572aff74d62f45
diff --git a/nfc/libnfc-nxp.muskie.conf b/nfc/libnfc-nxp.muskie.conf
index 7121a8e..8c430b5 100644
--- a/nfc/libnfc-nxp.muskie.conf
+++ b/nfc/libnfc-nxp.muskie.conf
@@ -79,11 +79,12 @@
# NXP RF configuration ALM/PLM settings
# This section needs to be updated with the correct values based on the platform
NXP_RF_CONF_BLK_1={
-20, 02, 22, 04,
+ 20, 02, 2B, 05,
A0, 0D, 03, 24, 03, 7E,
A0, 0D, 06, 34, 44, 66, 0A, 00, 00,
A0, 0D, 06, 06, 42, 00, 02, F4, F4,
- A0, 0D, 06, 06, 37, 28, 76, 00, 00
+ A0, 0D, 06, 06, 37, 28, 76, 00, 00,
+ A0, 0D, 06, 22, 44, 55, 0A, 00, 00
}
###############################################################################
diff --git a/self-extractors/google_devices/staging/BoardConfigPartial.mk b/self-extractors/google_devices/staging/BoardConfigPartial.mk
index d6292d3..f01d512 100644
--- a/self-extractors/google_devices/staging/BoardConfigPartial.mk
+++ b/self-extractors/google_devices/staging/BoardConfigPartial.mk
@@ -13,3 +13,8 @@
# limitations under the License.
BOARD_PREBUILT_VENDORIMAGE := vendor/google_devices/walleye/proprietary/vendor.img
+
+-include vendor/google/tools/android-info.mk
+ifdef USE_ANDROID_INFO
+ TARGET_BOARD_INFO_FILE := vendor/google_devices/walleye/android-info.txt
+endif
diff --git a/walleye/BoardConfig.mk b/walleye/BoardConfig.mk
index 89f83bd..66725e3 100644
--- a/walleye/BoardConfig.mk
+++ b/walleye/BoardConfig.mk
@@ -23,7 +23,7 @@
BOARD_BOOTIMAGE_PARTITION_SIZE := 33554432
#sepolicy common to muskie/walleye
-BOARD_SEPOLICY_DIRS += device/google/muskie/sepolicy
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/muskie/sepolicy
# Testing related defines
BOARD_PERFSETUP_SCRIPT := platform_testing/scripts/perf-setup/wahoo-setup.sh
