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

Commit c57e359d authored by Zhuoyao Zhang's avatar Zhuoyao Zhang
Browse files

Update Android.bp and vts/Android.mk for Hidl HALs 

* Using update-makefiles.sh to add make rule for profiler in Android.bp
* Remove make rule for profiler in vts/Android.mk.

Bug:31930023
Test: mma
Change-Id: Iea834d8610501c2fce63f65742db31bafb85c0b8
parent a13ec5a8

boot/1.0/Android.bp

+45 −0
Original line number Diff line number Diff line
@@ -112,3 +112,48 @@ cc_library_shared { 
        "android.hidl.base@1.0",

    ],

}



genrule {

    name: "android.hardware.boot@1.0-IBootControl-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.boot@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/boot/1.0/ $(genDir)/android/hardware/boot/1.0/",

    srcs: [

        "IBootControl.hal",

        "types.hal",

    ],

    out: [

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

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

    ],

}



genrule {

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

    srcs: [

        "IBootControl.hal",

        "types.hal",

    ],

    out: [

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

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

    ],

}



cc_library_shared {

    name: "android.hardware.boot@1.0-IBootControl-vts.profiler",

    generated_sources: ["android.hardware.boot@1.0-IBootControl-vts.profiler_genc++"],

    generated_headers: ["android.hardware.boot@1.0-IBootControl-vts.profiler_genc++_headers"],

    export_generated_headers: ["android.hardware.boot@1.0-IBootControl-vts.profiler_genc++_headers"],

    shared_libs: [

        "libbase",

        "libhidlbase",

        "libhidltransport",

        "libvts_profiling",

        "libvts_multidevice_proto",

        "libprotobuf-cpp-full",

        "android.hidl.base@1.0",

        "android.hardware.boot@1.0",

    ],

}

boot/1.0/vts/Android.mk

+1 −33
Original line number Diff line number Diff line
@@ -16,36 +16,4 @@ 


LOCAL_PATH := $(call my-dir)



# build profiler for boot.

include $(CLEAR_VARS)



LOCAL_MODULE := libvts_profiler_hidl_boot@1.0



LOCAL_SRC_FILES := \

  BootControl.vts \

  types.vts \



LOCAL_C_INCLUDES += \

  test/vts/drivers/libprofiling \



LOCAL_VTS_MODE := PROFILER



LOCAL_SHARED_LIBRARIES := \

   android.hardware.boot@1.0 \

   libbase \

   libcutils \

   liblog \

   libhidlbase \

   libhidltransport \

   libhwbinder \

   libprotobuf-cpp-full \

   libvts_common \

   libvts_multidevice_proto \

   libvts_profiling \

   libutils \



LOCAL_PROTOC_OPTIMIZE_TYPE := full



include $(BUILD_SHARED_LIBRARY)



include $(call all-makefiles-under,$(LOCAL_PATH))
 
include $(call all-subdir-makefiles)
 
 No newline at end of file

light/2.0/Android.bp

+45 −0
Original line number Diff line number Diff line
@@ -112,3 +112,48 @@ cc_library_shared { 
        "android.hidl.base@1.0",

    ],

}



genrule {

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

    srcs: [

        "ILight.hal",

        "types.hal",

    ],

    out: [

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

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

    ],

}



genrule {

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

    srcs: [

        "ILight.hal",

        "types.hal",

    ],

    out: [

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

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

    ],

}



cc_library_shared {

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

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

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

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

    shared_libs: [

        "libbase",

        "libhidlbase",

        "libhidltransport",

        "libvts_profiling",

        "libvts_multidevice_proto",

        "libprotobuf-cpp-full",

        "android.hidl.base@1.0",

        "android.hardware.light@2.0",

    ],

}

memtrack/1.0/Android.bp

+45 −0
Original line number Diff line number Diff line
@@ -112,3 +112,48 @@ cc_library_shared { 
        "android.hidl.base@1.0",

    ],

}



genrule {

    name: "android.hardware.memtrack@1.0-IMemtrack-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.memtrack@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/memtrack/1.0/ $(genDir)/android/hardware/memtrack/1.0/",

    srcs: [

        "IMemtrack.hal",

        "types.hal",

    ],

    out: [

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

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

    ],

}



genrule {

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

    srcs: [

        "IMemtrack.hal",

        "types.hal",

    ],

    out: [

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

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

    ],

}



cc_library_shared {

    name: "android.hardware.memtrack@1.0-IMemtrack-vts.profiler",

    generated_sources: ["android.hardware.memtrack@1.0-IMemtrack-vts.profiler_genc++"],

    generated_headers: ["android.hardware.memtrack@1.0-IMemtrack-vts.profiler_genc++_headers"],

    export_generated_headers: ["android.hardware.memtrack@1.0-IMemtrack-vts.profiler_genc++_headers"],

    shared_libs: [

        "libbase",

        "libhidlbase",

        "libhidltransport",

        "libvts_profiling",

        "libvts_multidevice_proto",

        "libprotobuf-cpp-full",

        "android.hidl.base@1.0",

        "android.hardware.memtrack@1.0",

    ],

}

memtrack/1.0/vts/Android.mk

+1 −31
Original line number Diff line number Diff line
@@ -16,36 +16,6 @@ 


LOCAL_PATH := $(call my-dir)



# build profiler for memtrack.

include $(CLEAR_VARS)



LOCAL_MODULE := libvts_profiler_hidl_memtrack@1.0



LOCAL_SRC_FILES := \

  Memtrack.vts \

  types.vts \



LOCAL_C_INCLUDES += \

  test/vts/drivers/libprofiling \



LOCAL_VTS_MODE := PROFILER



LOCAL_SHARED_LIBRARIES := \

   android.hardware.memtrack@1.0 \

   libbase \

   libcutils \

   liblog \

   libhidlbase \

   libhidltransport \

   libhwbinder \

   libprotobuf-cpp-full \

   libvts_common \

   libvts_multidevice_proto \

   libvts_profiling \

   libutils \



LOCAL_PROTOC_OPTIMIZE_TYPE := full



include $(BUILD_SHARED_LIBRARY)

include $(call all-subdir-makefiles)



include $(LOCAL_PATH)/functional/vts/testcases/hal/memtrack/hidl/target/Android.mk