diff options
| author | Sebastien Hertz <shertz@google.com> | 2015-04-01 16:34:17 +0200 |
|---|---|---|
| committer | Sebastien Hertz <shertz@google.com> | 2015-05-07 23:11:36 +0200 |
| commit | 5eae455507399286c845ba54796c47087a72b3e2 (patch) | |
| tree | ad1e60f846ee4bb0054d9267938a8f29b9bc95a9 /build/Android.gtest.mk | |
| parent | c3cde2c00bcbe97c9b0c119919500fcbbe824baa (diff) | |
| download | android_art-5eae455507399286c845ba54796c47087a72b3e2.tar.gz android_art-5eae455507399286c845ba54796c47087a72b3e2.tar.bz2 android_art-5eae455507399286c845ba54796c47087a72b3e2.zip | |
Support multiple instrumentation clients
Changes Instrumentation::ConfigureStubs to support multiple clients
that need different levels of instrumenation. A client is identified
by a string key used to save the desired instrumentation level.
Also adds regression gtest instrumentation_test and some cleanup.
Bug: 19829329
(cherry picked from commit 0462c4c87c39db6cfcd338f323844738109ac3c9)
Change-Id: I1fc24a86fcb7cb46d4be806895376c25cc0a0b3c
Diffstat (limited to 'build/Android.gtest.mk')
| -rw-r--r-- | build/Android.gtest.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 5a3236d958..730e61d488 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -26,6 +26,7 @@ GTEST_DEX_DIRECTORIES := \ AllFields \ ExceptionHandle \ GetMethodSignature \ + Instrumentation \ Interfaces \ Main \ MultiDex \ @@ -64,6 +65,7 @@ ART_GTEST_class_linker_test_DEX_DEPS := Interfaces MultiDex MyClass Nested Stati ART_GTEST_compiler_driver_test_DEX_DEPS := AbstractMethod StaticLeafMethods ART_GTEST_dex_file_test_DEX_DEPS := GetMethodSignature Main Nested ART_GTEST_exception_test_DEX_DEPS := ExceptionHandle +ART_GTEST_instrumentation_test_DEX_DEPS := Instrumentation ART_GTEST_jni_compiler_test_DEX_DEPS := MyClassNatives ART_GTEST_jni_internal_test_DEX_DEPS := AllFields StaticLeafMethods ART_GTEST_oat_file_assistant_test_DEX_DEPS := Main MainStripped MultiDex Nested @@ -157,6 +159,7 @@ RUNTIME_GTEST_COMMON_SRC_FILES := \ runtime/handle_scope_test.cc \ runtime/indenter_test.cc \ runtime/indirect_reference_table_test.cc \ + runtime/instrumentation_test.cc \ runtime/intern_table_test.cc \ runtime/interpreter/safe_math_test.cc \ runtime/java_vm_ext_test.cc \ |