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

Commit 060d5fb8 authored by Keun Soo Yim's avatar Keun Soo Yim Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'vts files for radio hal' 

* changes:
  Use a new lib to generate a struct argument message musing a Py dict
  vts files for radio hal
parents 3068374b 481f8d66

radio/1.0/Android.bp

+299 −0
Original line number Diff line number Diff line
@@ -86,3 +86,302 @@ cc_library_shared { 
        "android.hidl.base@1.0",

    ],

}



genrule {

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

    srcs: [

        "types.hal",

        "IRadio.hal",

        "IRadioIndication.hal",

        "IRadioResponse.hal",

        "ISap.hal",

        "ISapCallback.hal",

    ],

    out: [

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

        "android/hardware/radio/1.0/Radio.vts.cpp",

        "android/hardware/radio/1.0/RadioIndication.vts.cpp",

        "android/hardware/radio/1.0/RadioResponse.vts.cpp",

        "android/hardware/radio/1.0/Sap.vts.cpp",

        "android/hardware/radio/1.0/SapCallback.vts.cpp",

    ],

}



genrule {

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

    srcs: [

        "types.hal",

        "IRadio.hal",

        "IRadioIndication.hal",

        "IRadioResponse.hal",

        "ISap.hal",

        "ISapCallback.hal",

    ],

    out: [

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

        "android/hardware/radio/1.0/Radio.vts.h",

        "android/hardware/radio/1.0/RadioIndication.vts.h",

        "android/hardware/radio/1.0/RadioResponse.vts.h",

        "android/hardware/radio/1.0/Sap.vts.h",

        "android/hardware/radio/1.0/SapCallback.vts.h",

    ],

}



cc_library_shared {

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

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

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

    export_generated_headers: ["android.hardware.radio.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.radio@1.0",

    ],

    export_shared_lib_headers: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "libutils",

        "android.hidl.base@1.0",

    ],

}



genrule {

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

    srcs: [

        "IRadio.hal",

        "types.hal",

    ],

    out: [

        "android/hardware/radio/1.0/Radio.vts.cpp",

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

    ],

}



genrule {

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

    srcs: [

        "IRadio.hal",

        "types.hal",

    ],

    out: [

        "android/hardware/radio/1.0/Radio.vts.h",

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

    ],

}



cc_library_shared {

    name: "android.hardware.radio@1.0-IRadio-vts.profiler",

    generated_sources: ["android.hardware.radio@1.0-IRadio-vts.profiler_genc++"],

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

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

    shared_libs: [

        "libbase",

        "libhidlbase",

        "libhidltransport",

        "libvts_profiling",

        "libvts_multidevice_proto",

        "libprotobuf-cpp-full",

        "android.hidl.base@1.0",

        "android.hardware.radio@1.0",

    ],

}



genrule {

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

    srcs: [

        "IRadioIndication.hal",

        "types.hal",

    ],

    out: [

        "android/hardware/radio/1.0/RadioIndication.vts.cpp",

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

    ],

}



genrule {

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

    srcs: [

        "IRadioIndication.hal",

        "types.hal",

    ],

    out: [

        "android/hardware/radio/1.0/RadioIndication.vts.h",

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

    ],

}



cc_library_shared {

    name: "android.hardware.radio@1.0-IRadioIndication-vts.profiler",

    generated_sources: ["android.hardware.radio@1.0-IRadioIndication-vts.profiler_genc++"],

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

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

    shared_libs: [

        "libbase",

        "libhidlbase",

        "libhidltransport",

        "libvts_profiling",

        "libvts_multidevice_proto",

        "libprotobuf-cpp-full",

        "android.hidl.base@1.0",

        "android.hardware.radio@1.0",

    ],

}



genrule {

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

    srcs: [

        "IRadioResponse.hal",

        "types.hal",

    ],

    out: [

        "android/hardware/radio/1.0/RadioResponse.vts.cpp",

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

    ],

}



genrule {

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

    srcs: [

        "IRadioResponse.hal",

        "types.hal",

    ],

    out: [

        "android/hardware/radio/1.0/RadioResponse.vts.h",

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

    ],

}



cc_library_shared {

    name: "android.hardware.radio@1.0-IRadioResponse-vts.profiler",

    generated_sources: ["android.hardware.radio@1.0-IRadioResponse-vts.profiler_genc++"],

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

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

    shared_libs: [

        "libbase",

        "libhidlbase",

        "libhidltransport",

        "libvts_profiling",

        "libvts_multidevice_proto",

        "libprotobuf-cpp-full",

        "android.hidl.base@1.0",

        "android.hardware.radio@1.0",

    ],

}



genrule {

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

    srcs: [

        "ISap.hal",

        "types.hal",

    ],

    out: [

        "android/hardware/radio/1.0/Sap.vts.cpp",

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

    ],

}



genrule {

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

    srcs: [

        "ISap.hal",

        "types.hal",

    ],

    out: [

        "android/hardware/radio/1.0/Sap.vts.h",

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

    ],

}



cc_library_shared {

    name: "android.hardware.radio@1.0-ISap-vts.profiler",

    generated_sources: ["android.hardware.radio@1.0-ISap-vts.profiler_genc++"],

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

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

    shared_libs: [

        "libbase",

        "libhidlbase",

        "libhidltransport",

        "libvts_profiling",

        "libvts_multidevice_proto",

        "libprotobuf-cpp-full",

        "android.hidl.base@1.0",

        "android.hardware.radio@1.0",

    ],

}



genrule {

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

    srcs: [

        "ISapCallback.hal",

        "types.hal",

    ],

    out: [

        "android/hardware/radio/1.0/SapCallback.vts.cpp",

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

    ],

}



genrule {

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

    srcs: [

        "ISapCallback.hal",

        "types.hal",

    ],

    out: [

        "android/hardware/radio/1.0/SapCallback.vts.h",

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

    ],

}



cc_library_shared {

    name: "android.hardware.radio@1.0-ISapCallback-vts.profiler",

    generated_sources: ["android.hardware.radio@1.0-ISapCallback-vts.profiler_genc++"],

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

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

    shared_libs: [

        "libbase",

        "libhidlbase",

        "libhidltransport",

        "libvts_profiling",

        "libvts_multidevice_proto",

        "libprotobuf-cpp-full",

        "android.hidl.base@1.0",

        "android.hardware.radio@1.0",

    ],

}

radio/1.0/vts/Android.mk

0 → 100644
+19 −0
Original line number Diff line number Diff line 
#

# Copyright (C) 2016 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#       http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#



LOCAL_PATH := $(call my-dir)



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

radio/1.0/vts/Radio.vts

0 → 100644
+1497 −0

File added.

Preview size limit exceeded, changes collapsed.

radio/1.0/vts/RadioIndication.vts

0 → 100644
+545 −0

File added.

Preview size limit exceeded, changes collapsed.

radio/1.0/vts/RadioResponse.vts

0 → 100644
+1382 −0

File added.

Preview size limit exceeded, changes collapsed.