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

Commit b62dc3e6 authored by Keun Soo Yim's avatar Keun Soo Yim
Browse files

use the new oneshot vts driver generation build rule 

Test: mma
Change-Id: Ib15399d6e7d5049b7a1912623ac2d95de9dfba73
parent 0c07b20a

boot/1.0/Android.bp

+58 −0
Original line number Original line Diff line number Diff line
@@ -54,3 +54,61 @@ cc_library_shared { 
        "android.hidl.base@1.0",

        "android.hidl.base@1.0",

    ],

    ],

}

}



genrule {

    name: "android.hardware.boot.vts.driver@1.0_genc++",

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

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

    srcs: [

        "types.hal",

        "IBootControl.hal",

    ],

    out: [

        "android/hardware/boot/1.0/types.vts.cpp",

        "android/hardware/boot/1.0/BootControl.vts.cpp",

    ],

}



genrule {

    name: "android.hardware.boot.vts.driver@1.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.boot@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/boot/1.0/ $(genDir)/android/hardware/boot/1.0/",

    srcs: [

        "types.hal",

        "IBootControl.hal",

    ],

    out: [

        "android/hardware/boot/1.0/types.vts.h",

        "android/hardware/boot/1.0/BootControl.vts.h",

    ],

}



cc_library_shared {

    name: "android.hardware.boot.vts.driver@1.0",

    generated_sources: ["android.hardware.boot.vts.driver@1.0_genc++"],

    generated_headers: ["android.hardware.boot.vts.driver@1.0_genc++_headers"],

    export_generated_headers: ["android.hardware.boot.vts.driver@1.0_genc++_headers"],

    shared_libs: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "liblog",

        "libutils",

        "libcutils",

        "libvts_common",

        "libvts_datatype",

        "libvts_measurement",

        "libvts_multidevice_proto",

        "libcamera_metadata",

        "libprotobuf-cpp-full",

        "android.hidl.base@1.0",

        "android.hardware.boot@1.0",

    ],

    export_shared_lib_headers: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "libutils",

        "android.hidl.base@1.0",

    ],

}

boot/1.0/vts/Android.mk

+0 −30
Original line number Original line Diff line number Diff line
@@ -16,36 +16,6 @@ 




LOCAL_PATH := $(call my-dir)

LOCAL_PATH := $(call my-dir)





# build VTS driver for Boot Control v1.0.

include $(CLEAR_VARS)



LOCAL_MODULE := libvts_driver_hidl_boot@1.0



LOCAL_SRC_FILES := \

  BootControl.vts \

  types.vts \



LOCAL_SHARED_LIBRARIES += \

  android.hardware.boot@1.0 \

  libbase \

  libutils \

  libcutils \

  liblog \

  libhidlbase \

  libhidltransport \

  libhwbinder \

  libprotobuf-cpp-full \

  libvts_common \

  libvts_datatype \

  libvts_measurement \

  libvts_multidevice_proto \



LOCAL_PROTOC_OPTIMIZE_TYPE := full



LOCAL_MULTILIB := both



include $(BUILD_SHARED_LIBRARY)



# build profiler for boot.

# build profiler for boot.

include $(CLEAR_VARS)

include $(CLEAR_VARS)

light/2.0/Android.bp

+58 −0
Original line number Original line Diff line number Diff line
@@ -54,3 +54,61 @@ cc_library_shared { 
        "android.hidl.base@1.0",

        "android.hidl.base@1.0",

    ],

    ],

}

}



genrule {

    name: "android.hardware.light.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.light@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/light/2.0/ $(genDir)/android/hardware/light/2.0/",

    srcs: [

        "types.hal",

        "ILight.hal",

    ],

    out: [

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

        "android/hardware/light/2.0/Light.vts.cpp",

    ],

}



genrule {

    name: "android.hardware.light.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.light@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/light/2.0/ $(genDir)/android/hardware/light/2.0/",

    srcs: [

        "types.hal",

        "ILight.hal",

    ],

    out: [

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

        "android/hardware/light/2.0/Light.vts.h",

    ],

}



cc_library_shared {

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

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

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

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

    shared_libs: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "liblog",

        "libutils",

        "libcutils",

        "libvts_common",

        "libvts_datatype",

        "libvts_measurement",

        "libvts_multidevice_proto",

        "libcamera_metadata",

        "libprotobuf-cpp-full",

        "android.hidl.base@1.0",

        "android.hardware.light@2.0",

    ],

    export_shared_lib_headers: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "libutils",

        "android.hidl.base@1.0",

    ],

}

light/2.0/vts/Android.mk

+0 −30
Original line number Original line Diff line number Diff line
@@ -16,34 +16,4 @@ 




LOCAL_PATH := $(call my-dir)

LOCAL_PATH := $(call my-dir)





# build VTS driver for Light v2.0.

include $(CLEAR_VARS)



LOCAL_MODULE := libvts_driver_hidl_light@2.0



LOCAL_SRC_FILES := \

    Light.vts \

    types.vts \



LOCAL_SHARED_LIBRARIES += \

    android.hardware.light@2.0 \

    libbase \

    libutils \

    libcutils \

    liblog \

    libhidlbase \

    libhidltransport \

    libhwbinder \

    libprotobuf-cpp-full \

    libvts_common \

    libvts_datatype \

    libvts_measurement \

    libvts_multidevice_proto



LOCAL_PROTOC_OPTIMIZE_TYPE := full



LOCAL_MULTILIB := both



include $(BUILD_SHARED_LIBRARY)



include $(call all-makefiles-under,$(LOCAL_PATH))
 
include $(call all-makefiles-under,$(LOCAL_PATH))

memtrack/1.0/Android.bp

+58 −0
Original line number Original line Diff line number Diff line
@@ -54,3 +54,61 @@ cc_library_shared { 
        "android.hidl.base@1.0",

        "android.hidl.base@1.0",

    ],

    ],

}

}



genrule {

    name: "android.hardware.memtrack.vts.driver@1.0_genc++",

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

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

    srcs: [

        "types.hal",

        "IMemtrack.hal",

    ],

    out: [

        "android/hardware/memtrack/1.0/types.vts.cpp",

        "android/hardware/memtrack/1.0/Memtrack.vts.cpp",

    ],

}



genrule {

    name: "android.hardware.memtrack.vts.driver@1.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.memtrack@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/memtrack/1.0/ $(genDir)/android/hardware/memtrack/1.0/",

    srcs: [

        "types.hal",

        "IMemtrack.hal",

    ],

    out: [

        "android/hardware/memtrack/1.0/types.vts.h",

        "android/hardware/memtrack/1.0/Memtrack.vts.h",

    ],

}



cc_library_shared {

    name: "android.hardware.memtrack.vts.driver@1.0",

    generated_sources: ["android.hardware.memtrack.vts.driver@1.0_genc++"],

    generated_headers: ["android.hardware.memtrack.vts.driver@1.0_genc++_headers"],

    export_generated_headers: ["android.hardware.memtrack.vts.driver@1.0_genc++_headers"],

    shared_libs: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "liblog",

        "libutils",

        "libcutils",

        "libvts_common",

        "libvts_datatype",

        "libvts_measurement",

        "libvts_multidevice_proto",

        "libcamera_metadata",

        "libprotobuf-cpp-full",

        "android.hidl.base@1.0",

        "android.hardware.memtrack@1.0",

    ],

    export_shared_lib_headers: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "libutils",

        "android.hidl.base@1.0",

    ],

}