diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-05 12:49:19 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-05 12:49:19 +0000 |
| commit | 667bb41ed0da452e18ad6ec3118eb6cc758f4015 (patch) | |
| tree | 47d39242aa9e3f701a0eceb9db369a2f708b14c5 | |
| parent | 52db051f8218518aa718647a8f29cbbcd4499213 (diff) | |
| parent | bf67c79c6a69cd077b7be84c84b4f118cb0ac3b2 (diff) | |
| download | platform_test_vts-testcase_fuzz-android10-mainline-networking-release.tar.gz platform_test_vts-testcase_fuzz-android10-mainline-networking-release.tar.bz2 platform_test_vts-testcase_fuzz-android10-mainline-networking-release.zip | |
Snap for 5988121 from bf67c79c6a69cd077b7be84c84b4f118cb0ac3b2 to qt-aml-networking-releaseandroid-mainline-10.0.0_r6android10-mainline-networking-release
Change-Id: I695d622b73bb04c22c50ded3ec7fbde1aa5f8251
| -rw-r--r-- | iface_fuzzer/Android.bp | 3 | ||||
| -rw-r--r-- | iface_fuzzer/OWNERS | 5 | ||||
| -rw-r--r-- | iface_fuzzer/ProtoFuzzerRunner.cpp | 21 |
3 files changed, 13 insertions, 16 deletions
diff --git a/iface_fuzzer/Android.bp b/iface_fuzzer/Android.bp index b611bac..69f7672 100644 --- a/iface_fuzzer/Android.bp +++ b/iface_fuzzer/Android.bp @@ -41,7 +41,7 @@ cc_library { ], } -cc_binary { +cc_fuzz { name: "vts_proto_fuzzer", srcs: [ "ProtoFuzzerMain.cpp", @@ -59,7 +59,6 @@ cc_binary { "libvts_proto_fuzzer_proto", ], static_libs: [ - "libFuzzer", "libvts_proto_fuzzer", ], cflags: [ diff --git a/iface_fuzzer/OWNERS b/iface_fuzzer/OWNERS index 507c77b..e06b66c 100644 --- a/iface_fuzzer/OWNERS +++ b/iface_fuzzer/OWNERS @@ -1,2 +1,3 @@ -jiwonshin@google.com -yim@google.com +smoreland@google.com +trong@google.com +zhaomingyin@google.com diff --git a/iface_fuzzer/ProtoFuzzerRunner.cpp b/iface_fuzzer/ProtoFuzzerRunner.cpp index 9de2286..fbb166c 100644 --- a/iface_fuzzer/ProtoFuzzerRunner.cpp +++ b/iface_fuzzer/ProtoFuzzerRunner.cpp @@ -38,27 +38,24 @@ namespace vts { namespace fuzzer { static string GetDriverName(const CompSpec &comp_spec) { - stringstream version; - version.precision(1); - version << fixed << comp_spec.component_type_version(); - string driver_name = - comp_spec.package() + "@" + version.str() + "-vts.driver.so"; + stringstream version_major, version_minor; + version_major << comp_spec.component_type_version_major(); + version_minor << comp_spec.component_type_version_minor(); + string driver_name = comp_spec.package() + "@" + version_major.str() + "." + + version_minor.str() + "-vts.driver.so"; return driver_name; } static string GetServiceName(const CompSpec &comp_spec) { string hal_name = comp_spec.package(); - string hal_version = GetVersionString(comp_spec.component_type_version()); string iface_name = comp_spec.component_name(); - size_t major_version = - std::stoul(hal_version.substr(0, hal_version.find("."))); - size_t minor_version = - std::stoul(hal_version.substr(hal_version.find(".") + 1)); - auto instance_names = ::android::vintf::VintfObject::GetDeviceHalManifest()->getHidlInstances( - hal_name, Version(major_version, minor_version), iface_name); + hal_name, + Version(comp_spec.component_type_version_major(), + comp_spec.component_type_version_minor()), + iface_name); if (instance_names.empty()) { cerr << "HAL service name not available in VINTF." << endl; std::abort(); |