From 89afc45c35110a3397596813f65cf5d281679fbc Mon Sep 17 00:00:00 2001
From: Willi Ye <williye97@gmail.com>
Date: Sun, 19 Nov 2017 03:01:36 +0100
Subject: [PATCH] Use LA.UM.6.4.r1-03800-8x98.0 tag for NXP

* Newer tags have Oreo 8.1 merged, which don't work

Change-Id: I0cbcb10ec7d24ed6a03390f7f27f9f8080157212
---
 manifests/aospa.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/manifests/aospa.xml b/manifests/aospa.xml
index 545a449..9dc5bae 100644
--- a/manifests/aospa.xml
+++ b/manifests/aospa.xml
@@ -185,6 +185,14 @@
   <remove-project name="platform/packages/services/Telecomm" />
   <project path="packages/services/Telecomm" name="AOSPA/android_packages_services_Telecomm" remote="aospa" groups="aospa" />
 
+  <!-- NXP NFC -->
+  <remove-project name="platform/vendor/nxp/opensource/external/libnfc-nci" />
+  <project name="platform/vendor/nxp/opensource/external/libnfc-nci" path="vendor/nxp/opensource/external/libnfc-nci" revision="refs/tags/LA.UM.6.4.r1-03800-8x98.0" />
+  <remove-project name="platform/vendor/nxp/opensource/frameworks" />
+  <project name="platform/vendor/nxp/opensource/frameworks" path="vendor/nxp/opensource/frameworks" revision="refs/tags/LA.UM.6.4.r1-03800-8x98.0" />
+  <remove-project name="platform/vendor/nxp/opensource/packages/apps/Nfc" />
+  <project name="platform/vendor/nxp/opensource/packages/apps/Nfc" path="vendor/nxp/opensource/packages/apps/Nfc" revision="refs/tags/LA.UM.6.4.r1-03800-8x98.0" />
+
   <!-- Obsolete Packages -->
   <remove-project name="abl/tianocore/edk2"/>
   <remove-project name="device/generic/arm64"/>