Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5918507 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'vehicle_vndk' 

* changes:
  Build automotive hals with VNDK.
  convert vehicle to .bp
parents f6df1b24 22b2d681

CleanSpec.mk

+5 −1
Original line number Original line Diff line number Diff line
@@ -56,3 +56,7 @@ $(call add-clean-step, rm -rf $(OUT)/soong/.intermediates/) 
$(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/hardware/interfaces/)

$(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/hardware/interfaces/)

$(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/hardware/interfaces/)

$(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/hardware/interfaces/)

$(call add-clean-step, find $(PRODUCT_OUT)/system $(PRODUCT_OUT)/vendor -type f -name "android\.hardware\.configstore*" -print0 | xargs -0 rm -f)

$(call add-clean-step, find $(PRODUCT_OUT)/system $(PRODUCT_OUT)/vendor -type f -name "android\.hardware\.configstore*" -print0 | xargs -0 rm -f)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/hw/android.hardware.automotive*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/hw/android.hardware.automotive*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/hw/android.hardware.automotive*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/android.hardware.automotive*)

automotive/Android.bp

+3 −0
Original line number Original line Diff line number Diff line
@@ -4,5 +4,8 @@ subdirs = [ 
    "evs/1.0/default",

    "evs/1.0/default",

    "evs/1.0/vts/functional",

    "evs/1.0/vts/functional",

    "vehicle/2.0",

    "vehicle/2.0",

    "vehicle/2.0/default",

    "vehicle/2.0/default/impl/vhal_v2_0/proto",

    "vehicle/2.1",

    "vehicle/2.1",

    "vehicle/2.1/default",

]
 
]

automotive/vehicle/2.0/default/Android.bp

0 → 100644
+116 −0
Original line number Original line Diff line number Diff line 
// Copyright (C) 2017 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//       http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



cc_defaults {

    name: "vhal_v2_0_defaults",

    shared_libs: [

        "libhidlbase",

        "libhidltransport",

        "liblog",

        "libutils",

        "android.hardware.automotive.vehicle@2.0",

    ],

    cflags: [

        "-Wall",

        "-Wextra",

        "-Werror",

    ],

}



cc_library_headers {

    name: "vhal_v2_0_common_headers",

    vendor: true,

    export_include_dirs: ["common/include/vhal_v2_0"],

}



// Vehicle reference implementation lib

cc_library_static {

    name: "android.hardware.automotive.vehicle@2.0-manager-lib",

    vendor: true,

    defaults: ["vhal_v2_0_defaults"],

    srcs: [

        "common/src/SubscriptionManager.cpp",

        "common/src/VehicleHalManager.cpp",

        "common/src/VehicleObjectPool.cpp",

        "common/src/VehiclePropertyStore.cpp",

        "common/src/VehicleUtils.cpp",

    ],

    local_include_dirs: ["common/include/vhal_v2_0"],

    export_include_dirs: ["common/include"],

}



cc_library_shared {

    name: "android.hardware.automotive.vehicle@2.0-manager-lib-shared",

    vendor: true,

    static_libs: ["android.hardware.automotive.vehicle@2.0-manager-lib"],

    export_static_lib_headers: ["android.hardware.automotive.vehicle@2.0-manager-lib"],

}



// Vehicle default VehicleHAL implementation

cc_library_static {

    name: "android.hardware.automotive.vehicle@2.0-default-impl-lib",

    vendor: true,

    defaults: ["vhal_v2_0_defaults"],

    srcs: [

        "impl/vhal_v2_0/EmulatedVehicleHal.cpp",

        "impl/vhal_v2_0/VehicleEmulator.cpp",

        "impl/vhal_v2_0/PipeComm.cpp",

        "impl/vhal_v2_0/SocketComm.cpp",

    ],

    local_include_dirs: ["common/include/vhal_v2_0"],

    export_include_dirs: ["impl"],

    whole_static_libs: ["android.hardware.automotive.vehicle@2.0-manager-lib"],

    shared_libs: [

        "libbase",

        "libprotobuf-cpp-lite",

    ],

    static_libs: [

        "libqemu_pipe",

        "android.hardware.automotive.vehicle@2.0-libproto-native",

    ],

}



cc_test {

    name: "android.hardware.automotive.vehicle@2.0-manager-unit-tests",

    vendor: true,

    defaults: ["vhal_v2_0_defaults"],

    whole_static_libs: ["android.hardware.automotive.vehicle@2.0-manager-lib"],

    srcs: [

        "tests/RecurrentTimer_test.cpp",

        "tests/SubscriptionManager_test.cpp",

        "tests/VehicleHalManager_test.cpp",

        "tests/VehicleObjectPool_test.cpp",

        "tests/VehiclePropConfigIndex_test.cpp",

    ],

    header_libs: ["libbase_headers"],

}



cc_binary {

    name: "android.hardware.automotive.vehicle@2.0-service",

    defaults: ["vhal_v2_0_defaults"],

    init_rc: ["android.hardware.automotive.vehicle@2.0-service.rc"],

    vendor: true,

    relative_install_path: "hw",

    srcs: ["VehicleService.cpp"],

    shared_libs: [

        "libbase",

        "libprotobuf-cpp-lite",

    ],

    static_libs: [

        "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",

    ],

}

automotive/vehicle/2.0/default/Android.mk

deleted100644 → 0
+0 −194
Original line number Original line Diff line number Diff line 
# Copyright (C) 2016 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



LOCAL_PATH := $(call my-dir)



vhal_v2_0 = android.hardware.automotive.vehicle@2.0



###############################################################################

# Vehicle reference implementation lib

###############################################################################

include $(CLEAR_VARS)

LOCAL_MODULE := $(vhal_v2_0)-manager-lib

LOCAL_SRC_FILES := \

    common/src/SubscriptionManager.cpp \

    common/src/VehicleHalManager.cpp \

    common/src/VehicleObjectPool.cpp \

    common/src/VehiclePropertyStore.cpp \

    common/src/VehicleUtils.cpp \



LOCAL_C_INCLUDES := \

    $(LOCAL_PATH)/common/include/vhal_v2_0



LOCAL_EXPORT_C_INCLUDE_DIRS := \

    $(LOCAL_PATH)/common/include



LOCAL_SHARED_LIBRARIES := \

    libhidlbase \

    libhidltransport \

    liblog \

    libutils \

    $(vhal_v2_0) \



include $(BUILD_STATIC_LIBRARY)





include $(CLEAR_VARS)

LOCAL_MODULE := $(vhal_v2_0)-manager-lib-shared

LOCAL_SRC_FILES := \

    common/src/SubscriptionManager.cpp \

    common/src/VehicleHalManager.cpp \

    common/src/VehicleObjectPool.cpp \

    common/src/VehiclePropertyStore.cpp \

    common/src/VehicleUtils.cpp \



LOCAL_C_INCLUDES := \

    $(LOCAL_PATH)/common/include/vhal_v2_0



LOCAL_EXPORT_C_INCLUDE_DIRS := \

    $(LOCAL_PATH)/common/include



LOCAL_SHARED_LIBRARIES := \

    libhidlbase \

    libhidltransport \

    liblog \

    libutils \

    $(vhal_v2_0) \



include $(BUILD_SHARED_LIBRARY)



###############################################################################

# Vehicle HAL Protobuf library

###############################################################################

include $(CLEAR_VARS)

LOCAL_SRC_FILES := $(call all-proto-files-under, impl/vhal_v2_0/proto)



LOCAL_PROTOC_OPTIMIZE_TYPE := nano



LOCAL_MODULE := $(vhal_v2_0)-libproto-native

LOCAL_MODULE_CLASS := STATIC_LIBRARIES



LOCAL_MODULE_TAGS := optional



LOCAL_STRIP_MODULE := keep_symbols



generated_sources_dir := $(call local-generated-sources-dir)

LOCAL_EXPORT_C_INCLUDE_DIRS := \

    $(generated_sources_dir)/proto/$(LOCAL_PATH)/impl/vhal_v2_0/proto



include $(BUILD_STATIC_LIBRARY)





###############################################################################

# Vehicle default VehicleHAL implementation

###############################################################################

include $(CLEAR_VARS)



LOCAL_MODULE:= $(vhal_v2_0)-default-impl-lib

LOCAL_SRC_FILES:= \

    impl/vhal_v2_0/EmulatedVehicleHal.cpp \

    impl/vhal_v2_0/VehicleEmulator.cpp \

    impl/vhal_v2_0/PipeComm.cpp \

    impl/vhal_v2_0/SocketComm.cpp \



LOCAL_C_INCLUDES := \

    $(LOCAL_PATH)/impl/vhal_v2_0



LOCAL_EXPORT_C_INCLUDE_DIRS := \

    $(LOCAL_PATH)/impl



LOCAL_WHOLE_STATIC_LIBRARIES := \

    $(vhal_v2_0)-manager-lib \



LOCAL_SHARED_LIBRARIES := \

    libbase \

    libhidlbase \

    libhidltransport \

    liblog \

    libprotobuf-cpp-lite \

    libutils \

    $(vhal_v2_0) \



LOCAL_STATIC_LIBRARIES := \

    libqemu_pipe \

    $(vhal_v2_0)-libproto-native \



LOCAL_CFLAGS += -Wall -Wextra -Werror



include $(BUILD_STATIC_LIBRARY)





###############################################################################

# Vehicle reference implementation unit tests

###############################################################################

include $(CLEAR_VARS)



LOCAL_MODULE:= $(vhal_v2_0)-manager-unit-tests



LOCAL_WHOLE_STATIC_LIBRARIES := \

    $(vhal_v2_0)-manager-lib \



LOCAL_SRC_FILES:= \

    tests/RecurrentTimer_test.cpp \

    tests/SubscriptionManager_test.cpp \

    tests/VehicleHalManager_test.cpp \

    tests/VehicleObjectPool_test.cpp \

    tests/VehiclePropConfigIndex_test.cpp \



LOCAL_HEADER_LIBRARIES := \

    libbase_headers



LOCAL_SHARED_LIBRARIES := \

    libhidlbase \

    libhidltransport \

    liblog \

    libutils \

    $(vhal_v2_0) \



LOCAL_CFLAGS += -Wall -Wextra -Werror

LOCAL_MODULE_TAGS := tests



include $(BUILD_NATIVE_TEST)





###############################################################################

# Vehicle HAL service

###############################################################################

include $(CLEAR_VARS)

LOCAL_MODULE := $(vhal_v2_0)-service

LOCAL_INIT_RC := $(vhal_v2_0)-service.rc

LOCAL_PROPRIETARY_MODULE := true

LOCAL_MODULE_RELATIVE_PATH := hw



LOCAL_SRC_FILES := \

    VehicleService.cpp



LOCAL_SHARED_LIBRARIES := \

    libbase \

    libhidlbase \

    libhidltransport \

    liblog \

    libprotobuf-cpp-lite \

    libutils \

    $(vhal_v2_0) \



LOCAL_STATIC_LIBRARIES := \

    $(vhal_v2_0)-manager-lib \

    $(vhal_v2_0)-default-impl-lib \

    $(vhal_v2_0)-libproto-native \

    libqemu_pipe \



LOCAL_CFLAGS += -Wall -Wextra -Werror



include $(BUILD_EXECUTABLE)

automotive/vehicle/2.0/default/impl/vhal_v2_0/proto/Android.bp

0 → 100644
+27 −0
Original line number Original line Diff line number Diff line 
// Copyright (C) 2017 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//       http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



// Vehicle HAL Protobuf library

cc_library_static {

    name: "android.hardware.automotive.vehicle@2.0-libproto-native",

    vendor: true,

    proto: {

        export_proto_headers: true,

        type: "lite",

    },

    strip: {

        keep_symbols: true,

    },

    srcs: ["VehicleHalProto.proto"]

}