commit 614b6e16d26119895951c8af646a685a015e35e8
author Roman Kiryanov <rkir@google.com> Wed Dec 09 02:45:44 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 09 02:45:44 2020 +0000
tree bc3ea3527986e20dfaeb370313df451c13e3eca5
parent 856be03fc779292b55d9ffa24638cd0a10bdadce
parent 936f30e611bb0118569d630f6f11c1ebec327809

Merge "Revert "Link libqemu_pipe into a.h.a.vehicle@2.0-default-impl-lib"" am: b22fba9f02 am: 936f30e611

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1520552

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I287dc70280139f9709fa9380dda52cffbae8ea08

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 4c0963d..590adc5 100644
--- a/automotive/vehicle/2.0/default/Android.bp
+++ b/automotive/vehicle/2.0/default/Android.bp
@@ -88,7 +88,6 @@
     whole_static_libs: [
         "android.hardware.automotive.vehicle@2.0-emulated-user-hal-lib",
         "android.hardware.automotive.vehicle@2.0-manager-lib",
-        "libqemu_pipe",
     ],
     shared_libs: [
         "libbase",
@@ -96,6 +95,7 @@
         "libprotobuf-cpp-lite",
     ],
     static_libs: [
+        "libqemu_pipe",
         "android.hardware.automotive.vehicle@2.0-libproto-native",
     ],
 }
@@ -210,5 +210,6 @@
         "android.hardware.automotive.vehicle@2.0-manager-lib",
         "android.hardware.automotive.vehicle@2.0-default-impl-lib",
         "android.hardware.automotive.vehicle@2.0-libproto-native",
+        "libqemu_pipe",
     ],
 }