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

Commit 2579fb79 authored by Pavel Maltsev's avatar Pavel Maltsev
Browse files

Move Vehicle HAL under automotive package 

Test: verified unit tests and VTS are passing

Bug: b/33200203
Change-Id: I69cc4bc0d4cbc1a6bf2f77564a8f70412fe06947
parent afe76f27

automotive/Android.bp

0 → 100644
+5 −0
Original line number Diff line number Diff line 
// This is an autogenerated file, do not edit.

subdirs = [

    "vehicle",

    "vehicle/2.0",

]

vehicle/2.0/Android.bp→automotive/vehicle/2.0/Android.bp

+175 −0
Original line number Diff line number Diff line 
// This file is autogenerated by hidl-gen. Do not edit manually.



genrule {

    name: "android.hardware.vehicle@2.0_genc++",

    name: "android.hardware.automotive.vehicle@2.0_genc++",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vehicle@2.0",

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0",

    srcs: [

        "types.hal",

        "IVehicle.hal",

        "IVehicleCallback.hal",

    ],

    out: [

        "android/hardware/vehicle/2.0/types.cpp",

        "android/hardware/vehicle/2.0/VehicleAll.cpp",

        "android/hardware/vehicle/2.0/VehicleCallbackAll.cpp",

        "android/hardware/automotive/vehicle/2.0/types.cpp",

        "android/hardware/automotive/vehicle/2.0/VehicleAll.cpp",

        "android/hardware/automotive/vehicle/2.0/VehicleCallbackAll.cpp",

    ],

}



genrule {

    name: "android.hardware.vehicle@2.0_genc++_headers",

    name: "android.hardware.automotive.vehicle@2.0_genc++_headers",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vehicle@2.0",

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0",

    srcs: [

        "types.hal",

        "IVehicle.hal",

        "IVehicleCallback.hal",

    ],

    out: [

        "android/hardware/vehicle/2.0/types.h",

        "android/hardware/vehicle/2.0/IVehicle.h",

        "android/hardware/vehicle/2.0/IHwVehicle.h",

        "android/hardware/vehicle/2.0/BnHwVehicle.h",

        "android/hardware/vehicle/2.0/BpHwVehicle.h",

        "android/hardware/vehicle/2.0/BsVehicle.h",

        "android/hardware/vehicle/2.0/IVehicleCallback.h",

        "android/hardware/vehicle/2.0/IHwVehicleCallback.h",

        "android/hardware/vehicle/2.0/BnHwVehicleCallback.h",

        "android/hardware/vehicle/2.0/BpHwVehicleCallback.h",

        "android/hardware/vehicle/2.0/BsVehicleCallback.h",

        "android/hardware/automotive/vehicle/2.0/types.h",

        "android/hardware/automotive/vehicle/2.0/IVehicle.h",

        "android/hardware/automotive/vehicle/2.0/IHwVehicle.h",

        "android/hardware/automotive/vehicle/2.0/BnHwVehicle.h",

        "android/hardware/automotive/vehicle/2.0/BpHwVehicle.h",

        "android/hardware/automotive/vehicle/2.0/BsVehicle.h",

        "android/hardware/automotive/vehicle/2.0/IVehicleCallback.h",

        "android/hardware/automotive/vehicle/2.0/IHwVehicleCallback.h",

        "android/hardware/automotive/vehicle/2.0/BnHwVehicleCallback.h",

        "android/hardware/automotive/vehicle/2.0/BpHwVehicleCallback.h",

        "android/hardware/automotive/vehicle/2.0/BsVehicleCallback.h",

    ],

}



cc_library_shared {

    name: "android.hardware.vehicle@2.0",

    generated_sources: ["android.hardware.vehicle@2.0_genc++"],

    generated_headers: ["android.hardware.vehicle@2.0_genc++_headers"],

    export_generated_headers: ["android.hardware.vehicle@2.0_genc++_headers"],

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

    generated_sources: ["android.hardware.automotive.vehicle@2.0_genc++"],

    generated_headers: ["android.hardware.automotive.vehicle@2.0_genc++_headers"],

    export_generated_headers: ["android.hardware.automotive.vehicle@2.0_genc++_headers"],

    shared_libs: [

        "libhidlbase",

        "libhidltransport",
@@ -64,42 +64,42 @@ cc_library_shared { 
}



genrule {

    name: "android.hardware.vehicle.vts.driver@2.0_genc++",

    name: "android.hardware.automotive.vehicle.vts.driver@2.0_genc++",

    tools: ["hidl-gen", "vtsc"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vehicle@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/vehicle/2.0/ $(genDir)/android/hardware/vehicle/2.0/",

    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/automotive/vehicle/2.0/ $(genDir)/android/hardware/automotive/vehicle/2.0/",

    srcs: [

        "types.hal",

        "IVehicle.hal",

        "IVehicleCallback.hal",

    ],

    out: [

        "android/hardware/vehicle/2.0/types.vts.cpp",

        "android/hardware/vehicle/2.0/Vehicle.vts.cpp",

        "android/hardware/vehicle/2.0/VehicleCallback.vts.cpp",

        "android/hardware/automotive/vehicle/2.0/types.vts.cpp",

        "android/hardware/automotive/vehicle/2.0/Vehicle.vts.cpp",

        "android/hardware/automotive/vehicle/2.0/VehicleCallback.vts.cpp",

    ],

}



genrule {

    name: "android.hardware.vehicle.vts.driver@2.0_genc++_headers",

    name: "android.hardware.automotive.vehicle.vts.driver@2.0_genc++_headers",

    tools: ["hidl-gen", "vtsc"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vehicle@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/vehicle/2.0/ $(genDir)/android/hardware/vehicle/2.0/",

    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/automotive/vehicle/2.0/ $(genDir)/android/hardware/automotive/vehicle/2.0/",

    srcs: [

        "types.hal",

        "IVehicle.hal",

        "IVehicleCallback.hal",

    ],

    out: [

        "android/hardware/vehicle/2.0/types.vts.h",

        "android/hardware/vehicle/2.0/Vehicle.vts.h",

        "android/hardware/vehicle/2.0/VehicleCallback.vts.h",

        "android/hardware/automotive/vehicle/2.0/types.vts.h",

        "android/hardware/automotive/vehicle/2.0/Vehicle.vts.h",

        "android/hardware/automotive/vehicle/2.0/VehicleCallback.vts.h",

    ],

}



cc_library_shared {

    name: "android.hardware.vehicle.vts.driver@2.0",

    generated_sources: ["android.hardware.vehicle.vts.driver@2.0_genc++"],

    generated_headers: ["android.hardware.vehicle.vts.driver@2.0_genc++_headers"],

    export_generated_headers: ["android.hardware.vehicle.vts.driver@2.0_genc++_headers"],

    name: "android.hardware.automotive.vehicle.vts.driver@2.0",

    generated_sources: ["android.hardware.automotive.vehicle.vts.driver@2.0_genc++"],

    generated_headers: ["android.hardware.automotive.vehicle.vts.driver@2.0_genc++_headers"],

    export_generated_headers: ["android.hardware.automotive.vehicle.vts.driver@2.0_genc++_headers"],

    shared_libs: [

        "libhidlbase",

        "libhidltransport",
@@ -114,7 +114,7 @@ cc_library_shared { 
        "libcamera_metadata",

        "libprotobuf-cpp-full",

        "android.hidl.base@1.0",

        "android.hardware.vehicle@2.0",

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

    ],

    export_shared_lib_headers: [

        "libhidlbase",
@@ -126,42 +126,42 @@ cc_library_shared { 
}



genrule {

    name: "android.hardware.vehicle@2.0-vts.profiler_genc++",

    name: "android.hardware.automotive.vehicle@2.0-vts.profiler_genc++",

    tools: ["hidl-gen", "vtsc"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vehicle@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/vehicle/2.0/ $(genDir)/android/hardware/vehicle/2.0/",

    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/automotive/vehicle/2.0/ $(genDir)/android/hardware/automotive/vehicle/2.0/",

    srcs: [

        "types.hal",

        "IVehicle.hal",

        "IVehicleCallback.hal",

    ],

    out: [

        "android/hardware/vehicle/2.0/types.vts.cpp",

        "android/hardware/vehicle/2.0/Vehicle.vts.cpp",

        "android/hardware/vehicle/2.0/VehicleCallback.vts.cpp",

        "android/hardware/automotive/vehicle/2.0/types.vts.cpp",

        "android/hardware/automotive/vehicle/2.0/Vehicle.vts.cpp",

        "android/hardware/automotive/vehicle/2.0/VehicleCallback.vts.cpp",

    ],

}



genrule {

    name: "android.hardware.vehicle@2.0-vts.profiler_genc++_headers",

    name: "android.hardware.automotive.vehicle@2.0-vts.profiler_genc++_headers",

    tools: ["hidl-gen", "vtsc"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vehicle@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/vehicle/2.0/ $(genDir)/android/hardware/vehicle/2.0/",

    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/automotive/vehicle/2.0/ $(genDir)/android/hardware/automotive/vehicle/2.0/",

    srcs: [

        "types.hal",

        "IVehicle.hal",

        "IVehicleCallback.hal",

    ],

    out: [

        "android/hardware/vehicle/2.0/types.vts.h",

        "android/hardware/vehicle/2.0/Vehicle.vts.h",

        "android/hardware/vehicle/2.0/VehicleCallback.vts.h",

        "android/hardware/automotive/vehicle/2.0/types.vts.h",

        "android/hardware/automotive/vehicle/2.0/Vehicle.vts.h",

        "android/hardware/automotive/vehicle/2.0/VehicleCallback.vts.h",

    ],

}



cc_library_shared {

    name: "android.hardware.vehicle@2.0-vts.profiler",

    generated_sources: ["android.hardware.vehicle@2.0-vts.profiler_genc++"],

    generated_headers: ["android.hardware.vehicle@2.0-vts.profiler_genc++_headers"],

    export_generated_headers: ["android.hardware.vehicle@2.0-vts.profiler_genc++_headers"],

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

    generated_sources: ["android.hardware.automotive.vehicle@2.0-vts.profiler_genc++"],

    generated_headers: ["android.hardware.automotive.vehicle@2.0-vts.profiler_genc++_headers"],

    export_generated_headers: ["android.hardware.automotive.vehicle@2.0-vts.profiler_genc++_headers"],

    shared_libs: [

        "libbase",

        "libhidlbase",
@@ -170,6 +170,6 @@ cc_library_shared { 
        "libvts_multidevice_proto",

        "libprotobuf-cpp-full",

        "android.hidl.base@1.0",

        "android.hardware.vehicle@2.0",

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

    ],

}

vehicle/2.0/Android.mk→automotive/vehicle/2.0/Android.mk

+246 −246

File changed and moved.

Preview size limit exceeded, changes collapsed.

vehicle/2.0/IVehicle.hal→automotive/vehicle/2.0/IVehicle.hal

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.hardware.vehicle@2.0;

package android.hardware.automotive.vehicle@2.0;



import IVehicleCallback;

vehicle/2.0/IVehicleCallback.hal→automotive/vehicle/2.0/IVehicleCallback.hal

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.hardware.vehicle@2.0;

package android.hardware.automotive.vehicle@2.0;



interface IVehicleCallback {