commit 56020bc1c7be8cc6d87e68b65eb0c5cb509c7c26
author Yu Shan <shanyu@google.com> Fri Jul 16 15:51:16 2021 -0700
committer Yu Shan <shanyu@google.com> Wed Jul 21 17:50:33 2021 -0700
tree 22bf36fb7459bb28bc16049b6ef3adabf270e5d5
parent 122eea67d3e4a10a125d8d8cc3d6157ceab4bdb6

Move emulatedUserHal to default VHAL.

Test: Run on emulator. Verify user hal logic works. unit test.
Bug: 193831021
Change-Id: I9b91205ac11837f31950018f2de12542df85e202

automotive/vehicle/2.0/default/Android.bp

diff --git a/automotive/vehicle/2.0/default/Android.bp b/automotive/vehicle/2.0/default/Android.bp
index 8bf6bbe..2c3422e 100644
--- a/automotive/vehicle/2.0/default/Android.bp
+++ b/automotive/vehicle/2.0/default/Android.bp
@@ -97,6 +97,7 @@
     local_include_dirs: ["common/include/vhal_v2_0"],
     export_include_dirs: ["impl"],
     whole_static_libs: [
+        "android.hardware.automotive.vehicle@2.0-emulated-user-hal-lib",
         "android.hardware.automotive.vehicle@2.0-manager-lib",
     ],
     shared_libs: [
@@ -215,8 +216,8 @@
         "android.hardware.automotive.vehicle@2.0-libproto-native",
     ],
     data: [
-        ":vhal_test_override_json",
         ":vhal_test_json",
+        ":vhal_test_override_json",
     ],
     test_suites: ["general-tests"],
 }