Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 10:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "keymaster_benchmark: remove usage of base::CommandLine" into main am: 03cafd0b65

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3309396

Change-Id: I089c0c093642ad5b810531fc9cd21dc02df8a926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Andrea Orru
2024-10-16 01:59:53 +00:00
committed by Automerger Merge Worker
parent 3b4ec21022 03cafd0b65
commit e6248dfd84
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
keymaster/4.0/vts/performance/Android.bp
View File

@@ -33,6 +33,5 @@ cc_benchmark {
"android.hardware.keymaster@4.0", "android.hardware.keymaster@4.0",
"libkeymaster4support", "libkeymaster4support",
"libsoftkeymasterdevice", "libsoftkeymasterdevice",
"libchrome"
], ],
} }

28
keymaster/4.0/vts/performance/Benchmark.cpp
View File

@@ -16,6 +16,8 @@
#define LOG_TAG "keymaster_benchmark" #define LOG_TAG "keymaster_benchmark"
#include <getopt.h>
#include <android/hardware/keymaster/4.0/IKeymasterDevice.h> #include <android/hardware/keymaster/4.0/IKeymasterDevice.h>
#include <android/hardware/keymaster/4.0/types.h> #include <android/hardware/keymaster/4.0/types.h>
#include <keymaster/keymaster_configuration.h> #include <keymaster/keymaster_configuration.h>
@@ -36,8 +38,6 @@
#include <benchmark/benchmark.h> #include <benchmark/benchmark.h>
#include <hidl/Status.h> #include <hidl/Status.h>
#include <base/command_line.h>
namespace android { namespace android {
namespace hardware { namespace hardware {
namespace keymaster { namespace keymaster {
@@ -700,14 +700,26 @@ BENCHMARK_KM_CIPHER_ALL_RSA_KEYS(RSA/ECB/OAEPPadding, SMALL_MESSAGE_SIZE);
} // namespace hardware } // namespace hardware
} // namespace android } // namespace android
namespace {
std::string ParseCommandLineFlags(int argc, char** argv) {
std::string service_name = "default";
static struct option long_options[] = {{"service_name", required_argument, 0, 's'},
{0, 0, 0, 0}};
int opt;
while ((opt = getopt_long(argc, argv, "s:", long_options, nullptr)) != -1) {
if (opt == 's') {
service_name = optarg;
}
}
return service_name;
}
} // namespace
int main(int argc, char** argv) { int main(int argc, char** argv) {
::benchmark::Initialize(&argc, argv); ::benchmark::Initialize(&argc, argv);
base::CommandLine::Init(argc, argv); std::string service_name = ParseCommandLineFlags(argc, argv);
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
auto service_name = command_line->GetSwitchValueASCII("service_name");
if (service_name.empty()) {
service_name = "default";
}
android::hardware::keymaster::V4_0::test::keymaster = android::hardware::keymaster::V4_0::test::keymaster =
android::hardware::keymaster::V4_0::test::KeymasterWrapper::newInstance(service_name); android::hardware::keymaster::V4_0::test::KeymasterWrapper::newInstance(service_name);
if (!android::hardware::keymaster::V4_0::test::keymaster) { if (!android::hardware::keymaster::V4_0::test::keymaster) {