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

Commit a701b82c authored by Yu Shan's avatar Yu Shan Committed by Android (Google) Code Review
Browse files

Merge "Increase VHAL property to V4." into main

parents e5eec1f9 6f2d0502

automotive/vehicle/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ cc_defaults { 
    name: "VehicleHalInterfaceDefaults",

    static_libs: [

        "android.hardware.automotive.vehicle-V3-ndk",

        "android.hardware.automotive.vehicle.property-V3-ndk",

        "android.hardware.automotive.vehicle.property-V4-ndk",

    ],

}
@@ -30,6 +30,6 @@ rust_defaults { 
    name: "VehicleHalInterfaceRustDefaults",

    rustlibs: [

        "android.hardware.automotive.vehicle-V3-rust",

        "android.hardware.automotive.vehicle.property-V3-rust",

        "android.hardware.automotive.vehicle.property-V4-rust",

    ],

}

automotive/vehicle/aidl/aidl_test/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ cc_test { 
cc_test {

    name: "VehiclePropertyAnnotationCppTest",

    srcs: ["VehiclePropertyAnnotationCppTest.cpp"],

    header_libs: ["IVehicleGeneratedHeaders-V3"],

    header_libs: ["IVehicleGeneratedHeaders-V4"],

    defaults: ["VehicleHalInterfaceDefaults"],

    test_suites: ["general-tests"],

}
@@ -49,11 +49,11 @@ android_test { 
    name: "VehiclePropertyAnnotationJavaTest",

    srcs: [

        "VehiclePropertyAnnotationJavaTest.java",

        ":IVehicleGeneratedJavaFiles-V3",

        ":IVehicleGeneratedJavaFiles-V4",

    ],

    static_libs: [

        "android.hardware.automotive.vehicle-V3-java",

        "android.hardware.automotive.vehicle.property-V3-java",

        "android.hardware.automotive.vehicle.property-V4-java",

        "androidx.test.runner",

        "truth",

    ],

automotive/vehicle/aidl/impl/default_config/JsonConfigLoader/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ cc_library { 
    defaults: ["VehicleHalDefaults"],

    static_libs: ["VehicleHalUtils"],

    header_libs: [

        "IVehicleGeneratedHeaders-V3",

        "IVehicleGeneratedHeaders-V4",

    ],

    shared_libs: ["libjsoncpp"],

}
@@ -44,7 +44,7 @@ cc_library { 
    defaults: ["VehicleHalDefaults"],

    static_libs: ["VehicleHalUtils"],

    header_libs: [

        "IVehicleGeneratedHeaders-V3",

        "IVehicleGeneratedHeaders-V4",

        "libbinder_headers",

    ],

    cflags: ["-DENABLE_VEHICLE_HAL_TEST_PROPERTIES"],
@@ -60,7 +60,7 @@ cc_library_headers { 
    defaults: ["VehicleHalDefaults"],

    static_libs: ["VehicleHalUtils"],

    header_libs: [

        "IVehicleGeneratedHeaders-V3",

        "IVehicleGeneratedHeaders-V4",

    ],

    shared_libs: ["libjsoncpp"],

}

automotive/vehicle/aidl/impl/default_config/test/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ cc_test { 
        "libgtest",

    ],

    header_libs: [

        "IVehicleGeneratedHeaders-V3",

        "IVehicleGeneratedHeaders-V4",

    ],

    shared_libs: [

        "libjsoncpp",
@@ -57,7 +57,7 @@ cc_test { 
        "-DENABLE_VEHICLE_HAL_TEST_PROPERTIES",

    ],

    header_libs: [

        "IVehicleGeneratedHeaders-V3",

        "IVehicleGeneratedHeaders-V4",

    ],

    shared_libs: [

        "libjsoncpp",

automotive/vehicle/aidl/impl/vhal/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ cc_library { 
    ],

    header_libs: [

        "IVehicleHardware",

        "IVehicleGeneratedHeaders-V3",

        "IVehicleGeneratedHeaders-V4",

    ],

    shared_libs: [

        "libbinder_ndk",