From 045138dedde5b1bcd00cecfd8b3c6cf202d4d9d5 Mon Sep 17 00:00:00 2001
From: Yu Shan <shanyu@google.com>
Date: Wed, 2 Jun 2021 16:15:29 -0700
Subject: [PATCH] Add vhal unit tests to presubmit.

Test: presubmit.
Bug: b/189883643
Change-Id: I8e93ffb1f5ea8bb7d8656d8955c97494638df85c
---
 automotive/vehicle/2.0/default/Android.bp   | 14 ++++++++++++++
 automotive/vehicle/2.0/default/TEST_MAPPING | 10 ++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 automotive/vehicle/2.0/default/TEST_MAPPING

diff --git a/automotive/vehicle/2.0/default/Android.bp b/automotive/vehicle/2.0/default/Android.bp
index 0b49ef9d2c..ea42c3eaa6 100644
--- a/automotive/vehicle/2.0/default/Android.bp
+++ b/automotive/vehicle/2.0/default/Android.bp
@@ -184,6 +184,14 @@ cc_test {
         "libbase",
         "libcutils",
     ],
+    exclude_shared_libs: [
+        "android.automotive.watchdog-V2-ndk_platform",
+        "android.hardware.automotive.vehicle@2.0",
+    ],
+    static_libs: [
+        "android.automotive.watchdog-V2-ndk_platform",
+        "android.hardware.automotive.vehicle@2.0",
+    ],
     header_libs: ["libbase_headers"],
     test_suites: ["general-tests"],
 }
@@ -196,10 +204,16 @@ cc_test {
         "impl/vhal_v2_0/tests/ProtoMessageConverter_test.cpp",
     ],
     static_libs: [
+        "android.automotive.watchdog-V2-ndk_platform",
+        "android.hardware.automotive.vehicle@2.0",
         "android.hardware.automotive.vehicle@2.0-default-impl-lib",
         "android.hardware.automotive.vehicle@2.0-libproto-native",
         "libprotobuf-cpp-lite",
     ],
+    exclude_shared_libs: [
+        "android.automotive.watchdog-V2-ndk_platform",
+        "android.hardware.automotive.vehicle@2.0",
+    ],
     test_suites: ["general-tests"],
 }
 
diff --git a/automotive/vehicle/2.0/default/TEST_MAPPING b/automotive/vehicle/2.0/default/TEST_MAPPING
new file mode 100644
index 0000000000..bb58700f62
--- /dev/null
+++ b/automotive/vehicle/2.0/default/TEST_MAPPING
@@ -0,0 +1,10 @@
+{
+  "presubmit": [
+    {
+      "name": "android.hardware.automotive.vehicle@2.0-manager-unit-tests"
+    },
+    {
+      "name": "android.hardware.automotive.vehicle@2.0-default-impl-unit-tests"
+    }
+  ]
+}