Merge "Add failure indicators on the main dashboard."
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/testcases/library/bionic_native_test/AndroidTest.xml b/testcases/library/bionic_native_test/AndroidTest.xml
deleted file mode 100644
index f0c3dde..0000000
--- a/testcases/library/bionic_native_test/AndroidTest.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-<configuration description="Config for VTS BionicNativeTest test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HostDrivenTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="BionicNativeTest" />
- <option name="binary-test-working-directories" value="
- _32bit::/data/local/tmp/nativetest,
- _64bit::/data/local/tmp/nativetest64"/>
- <option name="binary-test-ld-library-paths" value="
- _32bit::/data/local/tmp/nativetest/bionic-loader-test-libs,
- _64bit::/data/local/tmp/nativetest64/bionic-loader-test-libs" />
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/bionic-unit-tests-gcc/bionic-unit-tests-gcc,
- _64bit::DATA/nativetest64/bionic-unit-tests-gcc/bionic-unit-tests-gcc,
- _32bit::DATA/nativetest/bionic-unit-tests/bionic-unit-tests,
- _64bit::DATA/nativetest64/bionic-unit-tests/bionic-unit-tests,
- _32bit::DATA/nativetest/bionic-unit-tests-static/bionic-unit-tests-static,
- _64bit::DATA/nativetest64/bionic-unit-tests-static/bionic-unit-tests-static,
- _32bit::DATA/nativetest/bionic-loader-test-libs->,
- _64bit::DATA/nativetest64/bionic-loader-test-libs->
- "/>
- <option name="binary-test-type" value="gtest" />
- </test>
-</configuration>
diff --git a/testcases/library/bionic_unit_tests/AndroidTest.xml b/testcases/library/bionic_unit_tests/AndroidTest.xml
index 1170d69..7dd8cee 100644
--- a/testcases/library/bionic_unit_tests/AndroidTest.xml
+++ b/testcases/library/bionic_unit_tests/AndroidTest.xml
@@ -16,34 +16,15 @@
<configuration description="Config for VTS BionicUnitTests test cases">
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
<option name="push-group" value="HostDrivenTest.push" />
+ <option name="push" value="DATA/nativetest/bionic-loader-test-libs->/data/nativetest/bionic-loader-test-lib" />
+ <option name="push" value="DATA/nativetest64/bionic-loader-test-libs->/data/nativetest64/bionic-loader-test-libs" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="BionicUnitTests" />
- <option name="binary-test-ld-library-paths" value="
- _32bit::/data/local/tmp/nativetest,
- _32bit::/data/nativetest/bionic-loader-test-libs,
- _32bit::/data/nativetest/bionic-loader-test-libs/libdlext_test_fd,
- _32bit::/data/nativetest/bionic-loader-test-libs/dt_runpath_b_c_x,
- _32bit::/data/nativetest/bionic-loader-test-libs/libdlext_test_runpath_zip,
- _32bit::/data/nativetest/bionic-loader-test-libs/public_namespace_libs,
- _32bit::/data/nativetest/bionic-loader-test-libs/dt_runpath_a,
- _32bit::/data/nativetest/bionic-loader-test-libs/libatest_simple_zip,
- _32bit::/data/nativetest/bionic-loader-test-libs/prebuilt-elf-files,
- _64bit::/data/local/tmp/nativetest64,
- _64bit::/data/nativetest64/bionic-loader-test-libs,
- _64bit::/data/nativetest64/bionic-loader-test-libs/libdlext_test_fd,
- _64bit::/data/nativetest64/bionic-loader-test-libs/dt_runpath_b_c_x,
- _64bit::/data/nativetest64/bionic-loader-test-libs/libdlext_test_runpath_zip,
- _64bit::/data/nativetest64/bionic-loader-test-libs/public_namespace_libs,
- _64bit::/data/nativetest64/bionic-loader-test-libs/dt_runpath_a,
- _64bit::/data/nativetest64/bionic-loader-test-libs/libatest_simple_zip,
- _64bit::/data/nativetest64/bionic-loader-test-libs/prebuilt-elf-files," />
<option name="binary-test-sources" value="
- _32bit::DATA/nativetest/bionic-unit-tests/bionic-unit-tests,
- _64bit::DATA/nativetest64/bionic-unit-tests/bionic-unit-tests,
- _32bit::DATA/nativetest/bionic-loader-test-libs->/data/nativetest/bionic-loader-test-libs,
- _64bit::DATA/nativetest64/bionic-loader-test-libs->/data/nativetest64/bionic-loader-test-libs
+ _32bit::DATA/nativetest/bionic-unit-tests/bionic-unit-tests->/data/nativetest/bionic-unit-tests/bionic-unit-tests,
+ _64bit::DATA/nativetest64/bionic-unit-tests/bionic-unit-tests->/data/nativetest64/bionic-unit-tests/bionic-unit-tests
"/>
<option name="binary-test-type" value="gtest" />
</test>
diff --git a/testcases/library/bionic_unit_tests_gcc/AndroidTest.xml b/testcases/library/bionic_unit_tests_gcc/AndroidTest.xml
index ef7ea02..740bca7 100644
--- a/testcases/library/bionic_unit_tests_gcc/AndroidTest.xml
+++ b/testcases/library/bionic_unit_tests_gcc/AndroidTest.xml
@@ -16,34 +16,15 @@
<configuration description="Config for VTS BionicUnitTestsGcc test cases">
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
<option name="push-group" value="HostDrivenTest.push" />
+ <option name="push" value="DATA/nativetest/bionic-loader-test-libs->/data/nativetest/bionic-loader-test-lib" />
+ <option name="push" value="DATA/nativetest64/bionic-loader-test-libs->/data/nativetest64/bionic-loader-test-libs" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="BionicUnitTestsGcc" />
- <option name="binary-test-ld-library-paths" value="
- _32bit::/data/local/tmp/nativetest,
- _32bit::/data/nativetest/bionic-loader-test-libs,
- _32bit::/data/nativetest/bionic-loader-test-libs/libdlext_test_fd,
- _32bit::/data/nativetest/bionic-loader-test-libs/dt_runpath_b_c_x,
- _32bit::/data/nativetest/bionic-loader-test-libs/libdlext_test_runpath_zip,
- _32bit::/data/nativetest/bionic-loader-test-libs/public_namespace_libs,
- _32bit::/data/nativetest/bionic-loader-test-libs/dt_runpath_a,
- _32bit::/data/nativetest/bionic-loader-test-libs/libatest_simple_zip,
- _32bit::/data/nativetest/bionic-loader-test-libs/prebuilt-elf-files,
- _64bit::/data/local/tmp/nativetest64,
- _64bit::/data/nativetest64/bionic-loader-test-libs,
- _64bit::/data/nativetest64/bionic-loader-test-libs/libdlext_test_fd,
- _64bit::/data/nativetest64/bionic-loader-test-libs/dt_runpath_b_c_x,
- _64bit::/data/nativetest64/bionic-loader-test-libs/libdlext_test_runpath_zip,
- _64bit::/data/nativetest64/bionic-loader-test-libs/public_namespace_libs,
- _64bit::/data/nativetest64/bionic-loader-test-libs/dt_runpath_a,
- _64bit::/data/nativetest64/bionic-loader-test-libs/libatest_simple_zip,
- _64bit::/data/nativetest64/bionic-loader-test-libs/prebuilt-elf-files," />
<option name="binary-test-sources" value="
- _32bit::DATA/nativetest/bionic-unit-tests-gcc/bionic-unit-tests-gcc,
- _64bit::DATA/nativetest64/bionic-unit-tests-gcc/bionic-unit-tests-gcc,
- _32bit::DATA/nativetest/bionic-loader-test-libs->/data/nativetest/bionic-loader-test-libs,
- _64bit::DATA/nativetest64/bionic-loader-test-libs->/data/nativetest64/bionic-loader-test-libs
+ _32bit::DATA/nativetest/bionic-unit-tests-gcc/bionic-unit-tests-gcc->/data/nativetest/bionic-unit-tests-gcc/bionic-unit-tests-gcc,
+ _64bit::DATA/nativetest64/bionic-unit-tests-gcc/bionic-unit-tests-gcc->/data/nativetest64/bionic-unit-tests-gcc/bionic-unit-tests-gcc
"/>
<option name="binary-test-type" value="gtest" />
</test>
diff --git a/testcases/library/bionic_unit_tests_static/AndroidTest.xml b/testcases/library/bionic_unit_tests_static/AndroidTest.xml
index 50493bd..73202a5 100644
--- a/testcases/library/bionic_unit_tests_static/AndroidTest.xml
+++ b/testcases/library/bionic_unit_tests_static/AndroidTest.xml
@@ -16,34 +16,15 @@
<configuration description="Config for VTS BionicUnitTestsStatic test cases">
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
<option name="push-group" value="HostDrivenTest.push" />
+ <option name="push" value="DATA/nativetest/bionic-loader-test-libs->/data/nativetest/bionic-loader-test-lib" />
+ <option name="push" value="DATA/nativetest64/bionic-loader-test-libs->/data/nativetest64/bionic-loader-test-libs" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="BionicUnitTestsStatic" />
- <option name="binary-test-ld-library-paths" value="
- _32bit::/data/local/tmp/nativetest,
- _32bit::/data/nativetest/bionic-loader-test-libs,
- _32bit::/data/nativetest/bionic-loader-test-libs/libdlext_test_fd,
- _32bit::/data/nativetest/bionic-loader-test-libs/dt_runpath_b_c_x,
- _32bit::/data/nativetest/bionic-loader-test-libs/libdlext_test_runpath_zip,
- _32bit::/data/nativetest/bionic-loader-test-libs/public_namespace_libs,
- _32bit::/data/nativetest/bionic-loader-test-libs/dt_runpath_a,
- _32bit::/data/nativetest/bionic-loader-test-libs/libatest_simple_zip,
- _32bit::/data/nativetest/bionic-loader-test-libs/prebuilt-elf-files,
- _64bit::/data/local/tmp/nativetest64,
- _64bit::/data/nativetest64/bionic-loader-test-libs,
- _64bit::/data/nativetest64/bionic-loader-test-libs/libdlext_test_fd,
- _64bit::/data/nativetest64/bionic-loader-test-libs/dt_runpath_b_c_x,
- _64bit::/data/nativetest64/bionic-loader-test-libs/libdlext_test_runpath_zip,
- _64bit::/data/nativetest64/bionic-loader-test-libs/public_namespace_libs,
- _64bit::/data/nativetest64/bionic-loader-test-libs/dt_runpath_a,
- _64bit::/data/nativetest64/bionic-loader-test-libs/libatest_simple_zip,
- _64bit::/data/nativetest64/bionic-loader-test-libs/prebuilt-elf-files," />
<option name="binary-test-sources" value="
- _32bit::DATA/nativetest/bionic-unit-tests-static/bionic-unit-tests-static,
- _64bit::DATA/nativetest64/bionic-unit-tests-static/bionic-unit-tests-static,
- _32bit::DATA/nativetest/bionic-loader-test-libs->/data/nativetest/bionic-loader-test-libs,
- _64bit::DATA/nativetest64/bionic-loader-test-libs->/data/nativetest64/bionic-loader-test-libs
+ _32bit::DATA/nativetest/bionic-unit-tests-static/bionic-unit-tests-static->/data/nativetest/bionic-unit-tests-static/bionic-unit-tests-static,
+ _64bit::DATA/nativetest64/bionic-unit-tests-static/bionic-unit-tests-static->/data/nativetest64/bionic-unit-tests-static/bionic-unit-tests-static
"/>
<option name="binary-test-type" value="gtest" />
</test>
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