Update projects for NFC
* Restore NFC and Secure Element HAL from AOSP sources
* Add ST frameworks and system projects from codelinaro
* Drop our custom st project.
Issue: FP4-INT#20
Change-Id: I0da0f4a57ae1bcb905ea1947d1e4a99a3170e4da
diff --git a/snippets/codelinaro.xml b/snippets/codelinaro.xml
index ff8a571..3950238 100644
--- a/snippets/codelinaro.xml
+++ b/snippets/codelinaro.xml
@@ -74,4 +74,9 @@
<project name="platform/vendor/qcom-opensource/interfaces" path="vendor/qcom/opensource/interfaces" groups="clo-s" />
<project name="platform/vendor/qcom/opensource/commonsys-intf/audio" path="vendor/qcom/opensource/commonsys-intf/audio" groups="clo-s" />
<project name="platform/vendor/qcom-opensource/wfd-commonsys" path="vendor/qcom/opensource/commonsys-intf/wfd" />
+
+ <!-- ST NFC projects -->
+ <project name="platform/vendor/st/opensource/frameworks/st21nfc" path="vendor/st/opensource/commonsys/frameworks/st21nfc" groups="clo-s" />
+ <project name="platform/vendor/st/opensource/system/nfc" path="vendor/st/opensource/commonsys/system/nfc" groups="clo-s" />
+
</manifest>
diff --git a/snippets/fairphone.xml b/snippets/fairphone.xml
index ef996ed..cc5c145 100644
--- a/snippets/fairphone.xml
+++ b/snippets/fairphone.xml
@@ -11,5 +11,4 @@
<project path="vendor/fairphone/fp4-sibon" name="vendor/fairphone/fp4-sibon" groups="fairphone" />
<project path="vendor/fairphone/media" name="vendor/fairphone/media" groups="fairphone" />
- <project path="vendor/st" name="platform/vendor/st" groups="fairphone" />
</manifest>
diff --git a/snippets/remove.xml b/snippets/remove.xml
index d04e7cf..d87af73 100644
--- a/snippets/remove.xml
+++ b/snippets/remove.xml
@@ -130,8 +130,6 @@
<remove-project path="hardware/qcom/sm8150/vr" name="platform/hardware/qcom/sm8150/vr" groups="aosp,qcom_sm8150" />
<remove-project path="hardware/qcom/sm8150p/gps" name="platform/hardware/qcom/sm8150p/gps" groups="aosp,qcom_sm8150p" />
<remove-project path="hardware/qcom/wlan" name="platform/hardware/qcom/wlan" groups="aosp,qcom_wlan,pdk-qcom" />
- <remove-project path="hardware/st/nfc" name="platform/hardware/st/nfc" groups="aosp,pdk" />
- <remove-project path="hardware/st/secure_element" name="platform/hardware/st/secure_element" groups="aosp,pdk" />
<remove-project path="hardware/ti/am57x" name="platform/hardware/ti/am57x" groups="aosp,pdk" />