tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add server library build rules for both host and target" into rvc-dev am: c539468f28

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11889122

Change-Id: I763c9c14994e4d58db03a6704293ae0d9db893fc
This commit is contained in:
Hao Chen 2020-06-18 22:16:26 +00:00 committed by Automerger Merge Worker
commit 2f865f875c
2 changed files with 59 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
automotive/vehicle/2.0/default/Android.bp
View file

@ -15,12 +15,10 @@
cc_defaults {
name: "vhal_v2_0_defaults",
shared_libs: [
"libbinder_ndk",
"libhidlbase",
"liblog",
"libutils",
"android.hardware.automotive.vehicle@2.0",
"carwatchdog_aidl_interface-ndk_platform",
],
cflags: [
"-Wall",
@ -29,6 +27,15 @@ cc_defaults {
],
}
cc_defaults {
name: "vhal_v2_0_target_defaults",
defaults: ["vhal_v2_0_defaults"],
shared_libs: [
"libbinder_ndk",
"carwatchdog_aidl_interface-ndk_platform",
],
}
cc_library_headers {
name: "vhal_v2_0_common_headers",
vendor: true,
@ -39,7 +46,7 @@ cc_library_headers {
cc_library {
name: "android.hardware.automotive.vehicle@2.0-manager-lib",
vendor: true,
defaults: ["vhal_v2_0_defaults"],
defaults: ["vhal_v2_0_target_defaults"],
srcs: [
"common/src/Obd2SensorStore.cpp",
"common/src/SubscriptionManager.cpp",
@ -61,7 +68,7 @@ cc_library {
cc_library_static {
name: "android.hardware.automotive.vehicle@2.0-default-impl-lib",
vendor: true,
defaults: ["vhal_v2_0_defaults"],
defaults: ["vhal_v2_0_target_defaults"],
srcs: [
"impl/vhal_v2_0/CommConn.cpp",
"impl/vhal_v2_0/EmulatedVehicleConnector.cpp",
@ -97,16 +104,59 @@ cc_library_static {
cc_library_static {
name: "android.hardware.automotive.vehicle@2.0-emulated-user-hal-lib",
vendor: true,
defaults: ["vhal_v2_0_defaults"],
defaults: ["vhal_v2_0_target_defaults"],
srcs: [
"impl/vhal_v2_0/EmulatedUserHal.cpp",
],
}
// Vehicle HAL Server reference impl lib
cc_library_static {
name: "android.hardware.automotive.vehicle@2.0-server-common-lib",
vendor: true,
host_supported: true,
defaults: ["vhal_v2_0_defaults"],
local_include_dirs: ["common/include/vhal_v2_0"],
export_include_dirs: ["common/include"],
srcs: [
"common/src/Obd2SensorStore.cpp",
"common/src/VehicleObjectPool.cpp",
"common/src/VehicleUtils.cpp",
],
}
// Vehicle HAL Server default implementation
cc_library_static {
name: "android.hardware.automotive.vehicle@2.0-server-impl-lib",
vendor: true,
host_supported: true,
defaults: ["vhal_v2_0_defaults"],
local_include_dirs: ["common/include/vhal_v2_0"],
export_include_dirs: ["impl"],
srcs: [
"impl/vhal_v2_0/EmulatedUserHal.cpp",
"impl/vhal_v2_0/GeneratorHub.cpp",
"impl/vhal_v2_0/JsonFakeValueGenerator.cpp",
"impl/vhal_v2_0/LinearFakeValueGenerator.cpp",
"impl/vhal_v2_0/ProtoMessageConverter.cpp",
"impl/vhal_v2_0/VehicleHalServer.cpp",
],
whole_static_libs: [
"android.hardware.automotive.vehicle@2.0-server-common-lib",
],
static_libs: [
"android.hardware.automotive.vehicle@2.0-libproto-native",
],
shared_libs: [
"libbase",
"libjsoncpp",
],
}
cc_test {
name: "android.hardware.automotive.vehicle@2.0-manager-unit-tests",
vendor: true,
defaults: ["vhal_v2_0_defaults"],
defaults: ["vhal_v2_0_target_defaults"],
whole_static_libs: ["android.hardware.automotive.vehicle@2.0-manager-lib"],
srcs: [
"tests/RecurrentTimer_test.cpp",
@ -126,7 +176,7 @@ cc_test {
cc_test {
name: "android.hardware.automotive.vehicle@2.0-default-impl-unit-tests",
vendor: true,
defaults: ["vhal_v2_0_defaults"],
defaults: ["vhal_v2_0_target_defaults"],
srcs: [
"impl/vhal_v2_0/tests/ProtoMessageConverter_test.cpp",
],
@ -140,7 +190,7 @@ cc_test {
cc_binary {
name: "android.hardware.automotive.vehicle@2.0-service",
defaults: ["vhal_v2_0_defaults"],
defaults: ["vhal_v2_0_target_defaults"],
vintf_fragments: [
"android.hardware.automotive.vehicle@2.0-service.xml",
],

1
automotive/vehicle/2.0/default/impl/vhal_v2_0/proto/Android.bp
View file

@ -16,6 +16,7 @@
cc_library_static {
name: "android.hardware.automotive.vehicle@2.0-libproto-native",
vendor: true,
host_supported: true,
proto: {
export_proto_headers: true,
type: "lite",