diff options
Diffstat (limited to 'test/004-ReferenceMap')
| -rw-r--r-- | test/004-ReferenceMap/build.py | 19 | ||||
| -rwxr-xr-x[-rw-r--r--] | test/004-ReferenceMap/generate-sources (renamed from test/004-ReferenceMap/build) | 1 | ||||
| -rwxr-xr-x | test/004-ReferenceMap/javac_post.sh (renamed from test/004-ReferenceMap/javac_wrapper.sh) | 0 | ||||
| -rw-r--r-- | test/004-ReferenceMap/stack_walk_refmap_jni.cc | 5 |
4 files changed, 21 insertions, 4 deletions
diff --git a/test/004-ReferenceMap/build.py b/test/004-ReferenceMap/build.py new file mode 100644 index 0000000000..2cd378a24e --- /dev/null +++ b/test/004-ReferenceMap/build.py @@ -0,0 +1,19 @@ +# +# Copyright (C) 2022 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. + + +def build(ctx): + ctx.bash("./generate-sources") + ctx.default_build() diff --git a/test/004-ReferenceMap/build b/test/004-ReferenceMap/generate-sources index 6203c97769..9edc200083 100644..100755 --- a/test/004-ReferenceMap/build +++ b/test/004-ReferenceMap/generate-sources @@ -23,4 +23,3 @@ export D8=':' ###################################################################### ${SOONG_ZIP} --jar -o classes.jar -f classes.dex -./default-build "$@" diff --git a/test/004-ReferenceMap/javac_wrapper.sh b/test/004-ReferenceMap/javac_post.sh index bb5b349240..bb5b349240 100755 --- a/test/004-ReferenceMap/javac_wrapper.sh +++ b/test/004-ReferenceMap/javac_post.sh diff --git a/test/004-ReferenceMap/stack_walk_refmap_jni.cc b/test/004-ReferenceMap/stack_walk_refmap_jni.cc index 0659c0beb5..c84bd88db5 100644 --- a/test/004-ReferenceMap/stack_walk_refmap_jni.cc +++ b/test/004-ReferenceMap/stack_walk_refmap_jni.cc @@ -25,9 +25,8 @@ namespace art { int t_size = sizeof(t) / sizeof(*t); \ const OatQuickMethodHeader* method_header = GetCurrentOatQuickMethodHeader(); \ uintptr_t native_quick_pc = method_header->ToNativeQuickPc(GetMethod(), \ - dex_pc, \ - /* is_catch_handler */ false, \ - abort_if_not_found); \ + dex_pc, \ + abort_if_not_found); \ if (native_quick_pc != UINTPTR_MAX) { \ CheckReferences(t, \ t_size, \ |