From 87b0264022f286391401549b9a933b2bbcc5c7b4 Mon Sep 17 00:00:00 2001
From: Ajay Nambi <anambi@codeaurora.org>
Date: Thu, 15 Feb 2018 14:01:34 -0800
Subject: [PATCH] Move AtFwd hal from device to framework manifest.

AtFwd hal is implemented as an android service and
it stars from system partition, that is, it's not
a traditional vendor hal and hence it should be
declared in the framework manifest and not in the
device manifest.
This commit introduces new device specific framework
manifest (framework_manifest.xml) and moves AtFwd hal
from device to framework manifest.

Bug: 68662838
Test: vts_treble_vintf_test atcmdfwd service is served

Change-Id: I9df05206fbe067ddf19a96fc52aba6b2cc922172
(cherry picked from commit b2895ddbcf1cc0b8986b4a80a43a3f0b6eb9fd66)
---
 BoardConfig.mk         |  1 +
 framework_manifest.xml | 12 ++++++++++++
 manifest.xml           |  9 ---------
 3 files changed, 13 insertions(+), 9 deletions(-)
 create mode 100644 framework_manifest.xml

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 1eb91b2b..16d96b61 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -149,6 +149,7 @@ BOARD_CHARGER_ENABLE_SUSPEND := true
 # Vendor Interface Manifest
 DEVICE_MANIFEST_FILE := device/google/wahoo/manifest.xml
 DEVICE_MATRIX_FILE := device/google/wahoo/compatibility_matrix.xml
+DEVICE_FRAMEWORK_MANIFEST_FILE := device/google/wahoo/framework_manifest.xml
 
 BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
 
diff --git a/framework_manifest.xml b/framework_manifest.xml
new file mode 100644
index 00000000..c82d51c8
--- /dev/null
+++ b/framework_manifest.xml
@@ -0,0 +1,12 @@
+<manifest version="1.0" type="framework">
+    <hal format="hidl">
+        <name>vendor.qti.atcmdfwd</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IAtCmdFwd</name>
+            <instance>AtCmdFwdService</instance>
+        </interface>
+    </hal>
+</manifest>
+
diff --git a/manifest.xml b/manifest.xml
index f10c4453..ca6f6c7f 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -465,13 +465,4 @@
             <instance>cnd</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>vendor.qti.atcmdfwd</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IAtCmdFwd</name>
-            <instance>AtCmdFwdService</instance>
-        </interface>
-    </hal>
 </manifest>