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

Commit 6a537544 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6606167 from c539468f to rvc-release 

Change-Id: I9997967091a9ee0a519f80bb37975586c662294c
parents 34322043 c539468f

automotive/vehicle/2.0/default/Android.bp

+57 −7
Original line number Diff line number Diff line
@@ -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_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",

    ],

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

+1 −0
Original line number Diff line number Diff line
@@ -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",

camera/device/3.2/ICameraDeviceCallback.hal

+5 −2
Original line number Diff line number Diff line
@@ -87,8 +87,11 @@ interface ICameraDeviceCallback { 
     * ERROR_RESULT message.

     *

     * If an output buffer cannot be filled, its status field must be set to

     * STATUS_ERROR. In addition, notify() must be called with a ERROR_BUFFER

     * message.

     * STATUS_ERROR. In this case, notify() isn't required to be called with

     * an ERROR_BUFFER message. The framework will simply treat the notify()

     * call with ERROR_BUFFER as a no-op, and derive whether and when to notify

     * the application of buffer loss based on the buffer status and whether or not

     * the entire capture has failed.

     *

     * If the entire capture has failed, then this method still needs to be

     * called to return the output buffers to the framework. All the buffer

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ c3ec182ce325862b7d79e526f3e170c02cfee1497ed309d7c60d0de4ca636b0b android.hardwar 
578f640c653726d58f99c84a7e1bb63862e21ef7cbb4f7d95c3cc62de00dca35 android.hardware.automotive.evs@1.0::IEvsDisplay

f5bc6aa840db933cb9fd36668b06d3e2021cf5384bb70e459f22e2f2f921fba5 android.hardware.automotive.evs@1.0::IEvsEnumerator

d3a344b7bd4c0d2658ae7209f55a979b8f53f361fd00f4fca29d5baa56d11fd2 android.hardware.automotive.evs@1.0::types

d123013165a19b6353cdc46a57b2ff4a17179619d36dbd595dfcf15dcd099af6 android.hardware.camera.device@3.2::ICameraDeviceCallback # b/155353799

2924c3e43858190ee3e2da4c2fb93bba8ae065fe314451f035a7ec52cb80c94a android.hardware.camera.device@3.2::ICameraDeviceCallback # b/155353799

2410dd02d67786a732d36e80b0f8ccf55086604ef37f9838e2013ff2c571e404 android.hardware.camera.device@3.5::types

cd06a7911b9acd4a653bbf7133888878fbcb3f84be177c7a3f1becaae3d8618f android.hardware.camera.metadata@3.2::types

5cf81b1001296fbb3c5b3d275a859244f61cec5fa858d7be9cca46c5b7dfa733 android.hardware.camera.metadata@3.2::types # b/150331548

identity/aidl/vts/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -14,19 +14,19 @@ cc_test { 
        "ReaderAuthTests.cpp",

    ],

    shared_libs: [

        "android.hardware.keymaster@4.0",

        "libbinder",

        "libcrypto",

        "android.hardware.keymaster-ndk_platform",

    ],

    static_libs: [

        "libcppbor",

        "libkeymaster_portable",

        "libsoft_attestation_cert",

        "libpuresoftkeymasterdevice",

        "android.hardware.keymaster@4.0",

        "android.hardware.identity-support-lib",

        "android.hardware.identity-cpp",

        "android.hardware.keymaster-cpp",

        "android.hardware.keymaster-ndk_platform",

    ],

    test_suites: [

        "general-tests",