From 5634b3d41b631f7478a6b462e473764a64c1d8b6 Mon Sep 17 00:00:00 2001
From: Adam Serbinski <adam@serbinski.com>
Date: Mon, 13 May 2019 10:15:27 -0400
Subject: Android: simplify inclusion of HAL in AOSP build

- Override the 1.0 passthrough HAL implementation. This is to
prevent it from being built and installed.
- Automatically include the manifest.

Signed-off-by: Gary E. Miller <gem@rellim.com>
---
 android/README                                         |  1 -
 android/hal/Android.bp                                 |  2 ++
 android/hal/android.hardware.gnss@1.1-service.gpsd.xml | 11 +++++++++++
 android/manifest.xml                                   | 11 -----------
 4 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 android/hal/android.hardware.gnss@1.1-service.gpsd.xml
 delete mode 100644 android/manifest.xml

diff --git a/android/README b/android/README
index 1824ae64..8614d328 100644
--- a/android/README
+++ b/android/README
@@ -152,7 +152,6 @@ PRODUCT_PACKAGES += android.hardware.gnss@1.1 \
 PRODUCT_PROPERTY_OVERRIDES += \
 	service.gpsd.parameters=-Nn,-G,/dev/ttyACM0
 BOARD_SEPOLICY_DIRS += external/gpsd/android/sepolicy
-DEVICE_MANIFEST_FILE += external/gpsd/android/manifest.xml
 
 
 Contact: Adam Serbinski <aserbinski@gmail.com>
diff --git a/android/hal/Android.bp b/android/hal/Android.bp
index 2643c1e2..e2509e08 100644
--- a/android/hal/Android.bp
+++ b/android/hal/Android.bp
@@ -1,5 +1,7 @@
 cc_binary {
     name: "android.hardware.gnss@1.1-service.gpsd",
+    overrides: ["android.hardware.gnss@1.0-impl"],
+    vintf_fragments: ["android.hardware.gnss@1.1-service.gpsd.xml"],
     init_rc: ["android.hardware.gnss@1.1-service.gpsd.rc"],
     relative_install_path: "hw",
     vendor: true,
diff --git a/android/hal/android.hardware.gnss@1.1-service.gpsd.xml b/android/hal/android.hardware.gnss@1.1-service.gpsd.xml
new file mode 100644
index 00000000..57bf092c
--- /dev/null
+++ b/android/hal/android.hardware.gnss@1.1-service.gpsd.xml
@@ -0,0 +1,11 @@
+<manifest version="1.0" type="device">
+    <hal format="hidl">
+        <name>android.hardware.gnss</name>
+        <transport>hwbinder</transport>
+        <version>1.1</version>
+        <interface>
+            <name>IGnss</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>
diff --git a/android/manifest.xml b/android/manifest.xml
deleted file mode 100644
index 57bf092c..00000000
--- a/android/manifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<manifest version="1.0" type="device">
-    <hal format="hidl">
-        <name>android.hardware.gnss</name>
-        <transport>hwbinder</transport>
-        <version>1.1</version>
-        <interface>
-            <name>IGnss</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-</manifest>
-- 
cgit v1.2.1