commit 4c7b8f8fd93576daba32591c812206044b272480
author Edwin Tung <edwintung@google.com> Fri Jan 14 17:32:04 2022 +0800
committer Edwin Tung <edwintung@google.com> Tue Jan 18 21:08:17 2022 +0800
tree a9f181736ea48b8c87f6344be3531c45cc4e0de2
parent 946e355f8219122f51f8b71c0165b6ed29c9b205

Combining GnssVisibilityControl to gnss aidl_interface

Bug: 208728105
Test: atest VtsHalGnssTargetTest
Change-Id: I7295a59a93778a186727e2a22c9669770f021d1a

gnss/aidl/Android.bp

diff --git a/gnss/aidl/Android.bp b/gnss/aidl/Android.bp
index 12dd0ac..d90cf0b 100644
--- a/gnss/aidl/Android.bp
+++ b/gnss/aidl/Android.bp
@@ -24,27 +24,12 @@
 }
 
 aidl_interface {
-    name: "android.hardware.gnss.visibility_control",
-    vendor_available: true,
-    srcs: ["android/hardware/gnss/visibility_control/*.aidl"],
-    stability: "vintf",
-    backend: {
-        java: {
-            platform_apis: true,
-        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
-    },
-}
-
-aidl_interface {
     name: "android.hardware.gnss",
     vendor_available: true,
-    srcs: ["android/hardware/gnss/*.aidl"],
-    imports: ["android.hardware.gnss.visibility_control"],
+    srcs: [
+        "android/hardware/gnss/*.aidl",
+        "android/hardware/gnss/visibility_control/*.aidl",
+    ],
     stability: "vintf",
     backend: {
         java: {