From ecc207d94fd53a15a3b8cd6f481f6fe7c84df5d6 Mon Sep 17 00:00:00 2001
From: Shinru Han <shinruhan@google.com>
Date: Thu, 22 Feb 2024 09:13:41 +0000
Subject: [PATCH] Update vintf manifest

Use the default instance in the VINTF manifest regardless of whether the Pixel GNSS HAL exists.

Test: CTS/VTS pass
Bug: 320567656
Change-Id: I1abe379d1e399fe395f321036c0c2813bcbf5b79
---
 location/gnssd/Android.bp                     | 22 +------------------
 .../gnssd/android.hardware.gnss@vendor.xml    |  7 ------
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 location/gnssd/android.hardware.gnss@vendor.xml

diff --git a/location/gnssd/Android.bp b/location/gnssd/Android.bp
index 0d47910..f5b180c 100644
--- a/location/gnssd/Android.bp
+++ b/location/gnssd/Android.bp
@@ -14,29 +14,8 @@ license {
     ],
 }
 
-soong_config_module_type {
-    name: "lassen_gnss_aidl_service_cc_defaults",
-    module_type: "cc_defaults",
-    config_namespace: "pixel_gnss",
-    bool_variables: ["enable_pixel_gnss_aidl_service"],
-    properties: ["vintf_fragments"],
-}
-
-lassen_gnss_aidl_service_cc_defaults {
-    name: "lassen_gnss_aidl_service_cc_defaults",
-    soong_config_variables: {
-        enable_pixel_gnss_aidl_service: {
-            vintf_fragments: ["android.hardware.gnss@vendor.xml"],
-            conditions_default: {
-                vintf_fragments: ["android.hardware.gnss@default.xml"],
-            },
-        },
-    },
-}
-
 cc_prebuilt_binary {
     name: "android.hardware.gnss-service",
-    defaults: ["lassen_gnss_aidl_service_cc_defaults"],
     arch: {
         arm64: {
             srcs: ["release/android.hardware.gnss-service"],
@@ -72,6 +51,7 @@ cc_prebuilt_binary {
     },
 
     init_rc: ["init.gnss.rc"],
+    vintf_fragments: ["android.hardware.gnss@default.xml"],
 }
 
 cc_prebuilt_binary {
diff --git a/location/gnssd/android.hardware.gnss@vendor.xml b/location/gnssd/android.hardware.gnss@vendor.xml
deleted file mode 100644
index 3b1525b..0000000
--- a/location/gnssd/android.hardware.gnss@vendor.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<manifest version="1.0" type="device">
-    <hal format="aidl">
-        <name>android.hardware.gnss</name>
-        <version>3</version>
-        <fqname>IGnss/vendor</fqname>
-    </hal>
-</manifest>