Merge "Update profiler generator."
diff --git a/sysfuzzer/vtscompiler/code_gen/profiler/ProfilerCodeGenBase.cpp b/sysfuzzer/vtscompiler/code_gen/profiler/ProfilerCodeGenBase.cpp
index dccfae1..b49545c 100644
--- a/sysfuzzer/vtscompiler/code_gen/profiler/ProfilerCodeGenBase.cpp
+++ b/sysfuzzer/vtscompiler/code_gen/profiler/ProfilerCodeGenBase.cpp
@@ -58,7 +58,8 @@
GenerateProfilerMethodDeclForAttribute(out, attribute);
}
// Generate the declaration of main profiler function.
- out << "\nvoid HIDL_INSTRUMENTATION_FUNCTION(\n";
+ out << "\nvoid HIDL_INSTRUMENTATION_FUNCTION_"
+ << GetComponentName(message) << "(\n";
out.indent();
out.indent();
out << "HidlInstrumentor::InstrumentationEvent event,\n";
@@ -100,7 +101,8 @@
}
// Generate the main profiler function.
- out << "\nvoid HIDL_INSTRUMENTATION_FUNCTION(\n";
+ out << "\nvoid HIDL_INSTRUMENTATION_FUNCTION_"
+ << GetComponentName(message) << "(\n";
out.indent();
out.indent();
out << "HidlInstrumentor::InstrumentationEvent event,\n";
diff --git a/sysfuzzer/vtscompiler/test/golden/PROFILER/Nfc.profiler.cpp b/sysfuzzer/vtscompiler/test/golden/PROFILER/Nfc.profiler.cpp
index d857c5f..deb2953 100644
--- a/sysfuzzer/vtscompiler/test/golden/PROFILER/Nfc.profiler.cpp
+++ b/sysfuzzer/vtscompiler/test/golden/PROFILER/Nfc.profiler.cpp
@@ -10,7 +10,7 @@
namespace vts {
-void HIDL_INSTRUMENTATION_FUNCTION(
+void HIDL_INSTRUMENTATION_FUNCTION_INfc(
HidlInstrumentor::InstrumentationEvent event,
const char* package,
const char* version,
diff --git a/sysfuzzer/vtscompiler/test/golden/PROFILER/NfcClientCallback.profiler.cpp b/sysfuzzer/vtscompiler/test/golden/PROFILER/NfcClientCallback.profiler.cpp
index 12a0787..c8b8d14 100644
--- a/sysfuzzer/vtscompiler/test/golden/PROFILER/NfcClientCallback.profiler.cpp
+++ b/sysfuzzer/vtscompiler/test/golden/PROFILER/NfcClientCallback.profiler.cpp
@@ -10,7 +10,7 @@
namespace vts {
-void HIDL_INSTRUMENTATION_FUNCTION(
+void HIDL_INSTRUMENTATION_FUNCTION_INfcClientCallback(
HidlInstrumentor::InstrumentationEvent event,
const char* package,
const char* version,
diff --git a/sysfuzzer/vtscompiler/test/golden/PROFILER/hardware/interfaces/nfc/1.0/vts/Nfc.vts.h b/sysfuzzer/vtscompiler/test/golden/PROFILER/hardware/interfaces/nfc/1.0/vts/Nfc.vts.h
index b7094f5..43932a0 100644
--- a/sysfuzzer/vtscompiler/test/golden/PROFILER/hardware/interfaces/nfc/1.0/vts/Nfc.vts.h
+++ b/sysfuzzer/vtscompiler/test/golden/PROFILER/hardware/interfaces/nfc/1.0/vts/Nfc.vts.h
@@ -21,7 +21,7 @@
extern "C" {
- void HIDL_INSTRUMENTATION_FUNCTION(
+ void HIDL_INSTRUMENTATION_FUNCTION_INfc(
HidlInstrumentor::InstrumentationEvent event,
const char* package,
const char* version,
diff --git a/sysfuzzer/vtscompiler/test/golden/PROFILER/hardware/interfaces/nfc/1.0/vts/NfcClientCallback.vts.h b/sysfuzzer/vtscompiler/test/golden/PROFILER/hardware/interfaces/nfc/1.0/vts/NfcClientCallback.vts.h
index 804bf77..b6c54d6 100644
--- a/sysfuzzer/vtscompiler/test/golden/PROFILER/hardware/interfaces/nfc/1.0/vts/NfcClientCallback.vts.h
+++ b/sysfuzzer/vtscompiler/test/golden/PROFILER/hardware/interfaces/nfc/1.0/vts/NfcClientCallback.vts.h
@@ -20,7 +20,7 @@
extern "C" {
- void HIDL_INSTRUMENTATION_FUNCTION(
+ void HIDL_INSTRUMENTATION_FUNCTION_INfcClientCallback(
HidlInstrumentor::InstrumentationEvent event,
const char* package,
const char* version,
diff --git a/tools/vts-tradefed/res/push_groups/HidlHalTest.push b/tools/vts-tradefed/res/push_groups/HidlHalTest.push
index ad66832..de20587 100644
--- a/tools/vts-tradefed/res/push_groups/HidlHalTest.push
+++ b/tools/vts-tradefed/res/push_groups/HidlHalTest.push
@@ -45,47 +45,47 @@
DATA/lib/android.hardware.vr.vts.driver@1.0.so->/data/local/tmp/32/android.hardware.vr.vts.driver@1.0.so
DATA/lib64/android.hardware.vr.vts.driver@1.0.so->/data/local/tmp/64/android.hardware.vr.vts.driver@1.0.so
-DATA/lib/android.hardware.boot@1.0-IBootControl-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.boot@1.0::IBoot.profiler.so
-DATA/lib64/android.hardware.boot@1.0-IBootControl-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.boot@1.0::IBoot.profiler.so
+DATA/lib/android.hardware.boot@1.0-IBootControl-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.boot@1.0.profiler.so
+DATA/lib64/android.hardware.boot@1.0-IBootControl-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.boot@1.0.profiler.so
-DATA/lib/android.hardware.ir@1.0-IConsumerIr-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.ir@1.0::IConsumerIr.profiler.so
-DATA/lib64/android.hardware.ir@1.0-IConsumerIr-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.ir@1.0::IConsumerIr.profiler.so
+DATA/lib/android.hardware.ir@1.0-IConsumerIr-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.ir@1.0.profiler.so
+DATA/lib64/android.hardware.ir@1.0-IConsumerIr-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.ir@1.0.profiler.so
-DATA/lib/android.hardware.light@2.0-ILight-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.light@2.0::ILight.profiler.so
-DATA/lib64/android.hardware.light@2.0-ILight-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.light@2.0::ILight.profiler.so
+DATA/lib/android.hardware.light@2.0-ILight-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.light@2.0.profiler.so
+DATA/lib64/android.hardware.light@2.0-ILight-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.light@2.0.profiler.so
-DATA/lib/android.hardware.memtrack@1.0-IMemtrack-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.memtrack@1.0::IMemtrack.profiler.so
-DATA/lib64/android.hardware.memtrack@1.0-IMemtrack-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.memtrack@1.0::IMemtrack.profiler.so
+DATA/lib/android.hardware.memtrack@1.0-IMemtrack-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.memtrack@1.0.profiler.so
+DATA/lib64/android.hardware.memtrack@1.0-IMemtrack-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.memtrack@1.0.profiler.so
-DATA/lib/android.hardware.nfc@1.0-INfc-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.nfc@1.0::INfc.profiler.so
-DATA/lib64/android.hardware.nfc@1.0-INfc-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.nfc@1.0::INfc.profiler.so
+DATA/lib/android.hardware.nfc@1.0-INfc-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.nfc@1.0.profiler.so
+DATA/lib64/android.hardware.nfc@1.0-INfc-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.nfc@1.0.profiler.so
-DATA/lib/android.hardware.power@1.0-IPower-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.power@1.0::IPower.profiler.so
-DATA/lib64/android.hardware.power@1.0-IPower-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.power@1.0::IPower.profiler.so
+DATA/lib/android.hardware.power@1.0-IPower-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.power@1.0.profiler.so
+DATA/lib64/android.hardware.power@1.0-IPower-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.power@1.0.profiler.so
-DATA/lib/android.hardware.radio@1.0-IRadio-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.radio@1.0::IRadio.profiler.so
-DATA/lib64/android.hardware.radio@1.0-IRadio-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.radio@1.0::IRadio.profiler.so
+DATA/lib/android.hardware.radio@1.0-IRadio-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.radio@1.0.profiler.so
+DATA/lib64/android.hardware.radio@1.0-IRadio-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.radio@1.0.profiler.so
-DATA/lib/android.hardware.sensors@1.0-ISensors-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.sensors@1.0::ISensors.profiler.so
-DATA/lib64/android.hardware.sensors@1.0-ISensors-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.sensors@1.0::ISensors.profiler.so
+DATA/lib/android.hardware.sensors@1.0-ISensors-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.sensors@1.0.profiler.so
+DATA/lib64/android.hardware.sensors@1.0-ISensors-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.sensors@1.0.profiler.so
-DATA/lib/android.hardware.soundtrigger@2.0-ISoundTriggerHw-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.soundtrigger@2.0::ISoundTriggerHw.profiler.so
-DATA/lib64/android.hardware.soundtrigger@2.0-ISoundTriggerHw-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.soundtrigger@2.0::ISoundTriggerHw.profiler.so
+DATA/lib/android.hardware.soundtrigger@2.0-ISoundTriggerHw-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.soundtrigger@2.0.profiler.so
+DATA/lib64/android.hardware.soundtrigger@2.0-ISoundTriggerHw-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.soundtrigger@2.0.profiler.so
-DATA/lib/android.hardware.thermal@1.0-IThermal-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.thermal@1.0::IThermal.profiler.so
-DATA/lib64/android.hardware.thermal@1.0-IThermal-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.thermal@1.0::IThermal.profiler.so
+DATA/lib/android.hardware.thermal@1.0-IThermal-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.thermal@1.0.profiler.so
+DATA/lib64/android.hardware.thermal@1.0-IThermal-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.thermal@1.0.profiler.so
-DATA/lib/android.hardware.tv.cec@1.0-IHdmiCec-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.tv.cec@1.0::IHdmiCec.profiler.so
-DATA/lib64/android.hardware.tv.cec@1.0-IHdmiCec-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.tv.cec@1.0::IHdmiCec.profiler.so
+DATA/lib/android.hardware.tv.cec@1.0-IHdmiCec-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.tv.cec@1.0.profiler.so
+DATA/lib64/android.hardware.tv.cec@1.0-IHdmiCec-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.tv.cec@1.0.profiler.so
-DATA/lib/android.hardware.tv.input@1.0-ITvInput-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.tv.cec@1.0::ITvInput.profiler.so
-DATA/lib64/android.hardware.tv.input@1.0-ITvInput-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.tv.cec@1.0::ITvInput.profiler.so
+DATA/lib/android.hardware.tv.input@1.0-ITvInput-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.tv.cec@1.0.profiler.so
+DATA/lib64/android.hardware.tv.input@1.0-ITvInput-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.tv.cec@1.0.profiler.so
-DATA/lib/android.hardware.vehicle@2.0-IVehicle-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.vehicle@2.0::IVehicle.profiler.so
-DATA/lib64/android.hardware.vehicle@2.0-IVehicle-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.vehicle@2.0::IVehicle.profiler.so
+DATA/lib/android.hardware.vehicle@2.0-IVehicle-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.vehicle@2.0.profiler.so
+DATA/lib64/android.hardware.vehicle@2.0-IVehicle-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.vehicle@2.0.profiler.so
-DATA/lib/android.hardware.vibrator@1.0-IVibrator-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.vibrator@1.0::IVibrator.profiler.so
-DATA/lib64/android.hardware.vibrator@1.0-IVibrator-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.vibrator@1.0::IVibrator.profiler.so
+DATA/lib/android.hardware.vibrator@1.0-IVibrator-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.vibrator@1.0.profiler.so
+DATA/lib64/android.hardware.vibrator@1.0-IVibrator-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.vibrator@1.0.profiler.so
-DATA/lib/android.hardware.vr@1.0-IVr-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.vr@1.0::IVr.profiler.so
-DATA/lib64/android.hardware.vr@1.0-IVr-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.vr@1.0::IVr.profiler.so
+DATA/lib/android.hardware.vr@1.0-IVr-vts.profiler.so->/data/local/tmp/32/hw/android.hardware.vr@1.0.profiler.so
+DATA/lib64/android.hardware.vr@1.0-IVr-vts.profiler.so->/data/local/tmp/64/hw/android.hardware.vr@1.0.profiler.so