diff options
| author | 2020-02-12 14:08:07 +0000 | |
|---|---|---|
| committer | 2020-02-19 16:08:34 +0000 | |
| commit | fa458ac21af98b3bdde2c62ed86b9c192b994372 (patch) | |
| tree | 5fa7543c9fd5edd0e950b19a70412002e10bba47 /runtime/entrypoints_order_test.cc | |
| parent | 99d91d18f9f73427eced2f22642520d50c3c3b83 (diff) | |
Allow late lookup for @CriticalNative methods.
Test: Add and enable tests in 178-app-image-native-method
Test: Add and enable tests in jni_compiler_test
Test: Manually step through the new stub in GDB and check
that backtrace works at various points.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Test: aosp_taimen-userdebug boots.
Test: run-gtests.sh
Test: testrunner.py --target --optimizing
Bug: 112189621
Change-Id: If094e5062acbb99eefa88f2afb4815f93730cb82
Diffstat (limited to 'runtime/entrypoints_order_test.cc')
| -rw-r--r-- | runtime/entrypoints_order_test.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/runtime/entrypoints_order_test.cc b/runtime/entrypoints_order_test.cc index d88584d727..52c4142712 100644 --- a/runtime/entrypoints_order_test.cc +++ b/runtime/entrypoints_order_test.cc @@ -147,8 +147,12 @@ class EntrypointsOrderTest : public CommonRuntimeTest { void CheckJniEntryPoints() { CHECKED(OFFSETOF_MEMBER(JniEntryPoints, pDlsymLookup) == 0, JniEntryPoints_start_with_dlsymlookup); - CHECKED(OFFSETOF_MEMBER(JniEntryPoints, pDlsymLookup) - + sizeof(void*) == sizeof(JniEntryPoints), JniEntryPoints_all); + CHECKED(OFFSETOF_MEMBER(JniEntryPoints, pDlsymLookup) + sizeof(void*) == + OFFSETOF_MEMBER(JniEntryPoints, pDlsymLookupCritical), + JniEntryPoints_dlsymlookup_critical); + CHECKED(OFFSETOF_MEMBER(JniEntryPoints, pDlsymLookupCritical) + sizeof(void*) == + sizeof(JniEntryPoints), + JniEntryPoints_all); } void CheckQuickEntryPoints() { |