diff options
author | Dmitriy Ivanov <dimitry@google.com> | 2014-11-03 21:14:07 -0800 |
---|---|---|
committer | Dmitriy Ivanov <dimitry@google.com> | 2014-11-03 22:15:08 -0800 |
commit | f947be2889639defc6424b1813ccc779528b7598 (patch) | |
tree | a4e2df0805ec9b33aec2ad494678415ce0ec835f /tests/libs/dl_preempt_library_2.cpp | |
parent | 494bee796aa60131981308493e0e295493537e12 (diff) | |
download | android_bionic-f947be2889639defc6424b1813ccc779528b7598.tar.gz android_bionic-f947be2889639defc6424b1813ccc779528b7598.tar.bz2 android_bionic-f947be2889639defc6424b1813ccc779528b7598.zip |
Revert "Fix symbol lookup order during relocation"
This reverts commit 976402cca13a1f4f3aa988fd301575e134ef5f2c.
Bug: 18222321
Bug: 18211780
Change-Id: Iafdd3d843db7b1cf288be9a0232022816622c944
Diffstat (limited to 'tests/libs/dl_preempt_library_2.cpp')
-rw-r--r-- | tests/libs/dl_preempt_library_2.cpp | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/tests/libs/dl_preempt_library_2.cpp b/tests/libs/dl_preempt_library_2.cpp deleted file mode 100644 index 8df9a1667..000000000 --- a/tests/libs/dl_preempt_library_2.cpp +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2014 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. - */ - -// This one should be preempted by the function -// defined in libdl_preempt_test_1.so -extern "C" int __attribute__((weak)) lib_global_default_serial() { - return 2716057; -} - -// Even though this one is defined by -// libdl_preempt_test_1.so it should not be -// preempted because of protected visibility -extern "C" int __attribute__((weak,visibility("protected"))) lib_global_protected_serial() { - return 3370318; -} - -extern "C" int lib_global_default_get_serial() { - return lib_global_default_serial(); -} - -extern "C" int lib_global_protected_get_serial() { - return lib_global_protected_serial(); -} - |