summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Serbinski <adam@serbinski.com>2019-05-13 10:15:27 -0400
committerGary E. Miller <gem@rellim.com>2019-05-15 12:16:36 -0700
commit5634b3d41b631f7478a6b462e473764a64c1d8b6 (patch)
tree0298963b2bf230d7fc6cbf3e48a9339562c08b8e
parent4e5f21f3433c1ac3791e26de745a32a589bc144e (diff)
downloadgpsd-5634b3d41b631f7478a6b462e473764a64c1d8b6.tar.gz
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>
-rw-r--r--android/README1
-rw-r--r--android/hal/Android.bp2
-rw-r--r--android/hal/android.hardware.gnss@1.1-service.gpsd.xml (renamed from android/manifest.xml)0
3 files changed, 2 insertions, 1 deletions
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/manifest.xml b/android/hal/android.hardware.gnss@1.1-service.gpsd.xml
index 57bf092c..57bf092c 100644
--- a/android/manifest.xml
+++ b/android/hal/android.hardware.gnss@1.1-service.gpsd.xml