Merge "Link libqemu_pipe into a.h.a.vehicle@2.0-default-impl-lib" am: b2670c6f88 am: 5d2db50930

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e7979204dabf710354e821f0793342b8745b5e2
This commit is contained in:
Treehugger Robot
2020-12-08 23:58:48 +00:00
committed by Automerger Merge Worker

View File

@@ -88,6 +88,7 @@ cc_library_static {
whole_static_libs: [ whole_static_libs: [
"android.hardware.automotive.vehicle@2.0-emulated-user-hal-lib", "android.hardware.automotive.vehicle@2.0-emulated-user-hal-lib",
"android.hardware.automotive.vehicle@2.0-manager-lib", "android.hardware.automotive.vehicle@2.0-manager-lib",
"libqemu_pipe",
], ],
shared_libs: [ shared_libs: [
"libbase", "libbase",
@@ -95,7 +96,6 @@ cc_library_static {
"libprotobuf-cpp-lite", "libprotobuf-cpp-lite",
], ],
static_libs: [ static_libs: [
"libqemu_pipe",
"android.hardware.automotive.vehicle@2.0-libproto-native", "android.hardware.automotive.vehicle@2.0-libproto-native",
], ],
} }
@@ -210,6 +210,5 @@ cc_binary {
"android.hardware.automotive.vehicle@2.0-manager-lib", "android.hardware.automotive.vehicle@2.0-manager-lib",
"android.hardware.automotive.vehicle@2.0-default-impl-lib", "android.hardware.automotive.vehicle@2.0-default-impl-lib",
"android.hardware.automotive.vehicle@2.0-libproto-native", "android.hardware.automotive.vehicle@2.0-libproto-native",
"libqemu_pipe",
], ],
} }