From f02805209b88826c7889ee759baf22e99a393f9a Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Wed, 30 Aug 2017 09:32:28 +0900 Subject: Fix API level of cfi_* symbols to 27 API level of O-MR1 is 27. Bug: 63053790 Test: bionic tests passes Change-Id: I78f0bd8af106954326394d60bf4d0cf5e10f7f17 --- libdl/libdl.arm.map | 8 ++++---- libdl/libdl.arm64.map | 8 ++++---- libdl/libdl.map.txt | 8 ++++---- libdl/libdl.mips.map | 8 ++++---- libdl/libdl.mips64.map | 8 ++++---- libdl/libdl.x86.map | 8 ++++---- libdl/libdl.x86_64.map | 8 ++++---- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/libdl/libdl.arm.map b/libdl/libdl.arm.map index 9fc9d2369..628e20d1a 100644 --- a/libdl/libdl.arm.map +++ b/libdl/libdl.arm.map @@ -34,11 +34,11 @@ LIBC_N { dlvsym; # introduced=24 } LIBC; -LIBC_OMR1 { # future +LIBC_OMR1 { # introduced=27 global: - __cfi_shadow_size; # future - __cfi_slowpath; # future - __cfi_slowpath_diag; # future + __cfi_shadow_size; # introduced=27 + __cfi_slowpath; # introduced=27 + __cfi_slowpath_diag; # introduced=27 } LIBC_N; LIBC_PLATFORM { diff --git a/libdl/libdl.arm64.map b/libdl/libdl.arm64.map index bde6cab38..1095fb326 100644 --- a/libdl/libdl.arm64.map +++ b/libdl/libdl.arm64.map @@ -33,11 +33,11 @@ LIBC_N { dlvsym; # introduced=24 } LIBC; -LIBC_OMR1 { # future +LIBC_OMR1 { # introduced=27 global: - __cfi_shadow_size; # future - __cfi_slowpath; # future - __cfi_slowpath_diag; # future + __cfi_shadow_size; # introduced=27 + __cfi_slowpath; # introduced=27 + __cfi_slowpath_diag; # introduced=27 } LIBC_N; LIBC_PLATFORM { diff --git a/libdl/libdl.map.txt b/libdl/libdl.map.txt index d1f4ab8d1..985082e85 100644 --- a/libdl/libdl.map.txt +++ b/libdl/libdl.map.txt @@ -33,11 +33,11 @@ LIBC_N { dlvsym; # introduced=24 } LIBC; -LIBC_OMR1 { # future +LIBC_OMR1 { # introduced=27 global: - __cfi_shadow_size; # future - __cfi_slowpath; # future - __cfi_slowpath_diag; # future + __cfi_shadow_size; # introduced=27 + __cfi_slowpath; # introduced=27 + __cfi_slowpath_diag; # introduced=27 } LIBC_N; LIBC_PLATFORM { diff --git a/libdl/libdl.mips.map b/libdl/libdl.mips.map index bde6cab38..1095fb326 100644 --- a/libdl/libdl.mips.map +++ b/libdl/libdl.mips.map @@ -33,11 +33,11 @@ LIBC_N { dlvsym; # introduced=24 } LIBC; -LIBC_OMR1 { # future +LIBC_OMR1 { # introduced=27 global: - __cfi_shadow_size; # future - __cfi_slowpath; # future - __cfi_slowpath_diag; # future + __cfi_shadow_size; # introduced=27 + __cfi_slowpath; # introduced=27 + __cfi_slowpath_diag; # introduced=27 } LIBC_N; LIBC_PLATFORM { diff --git a/libdl/libdl.mips64.map b/libdl/libdl.mips64.map index bde6cab38..1095fb326 100644 --- a/libdl/libdl.mips64.map +++ b/libdl/libdl.mips64.map @@ -33,11 +33,11 @@ LIBC_N { dlvsym; # introduced=24 } LIBC; -LIBC_OMR1 { # future +LIBC_OMR1 { # introduced=27 global: - __cfi_shadow_size; # future - __cfi_slowpath; # future - __cfi_slowpath_diag; # future + __cfi_shadow_size; # introduced=27 + __cfi_slowpath; # introduced=27 + __cfi_slowpath_diag; # introduced=27 } LIBC_N; LIBC_PLATFORM { diff --git a/libdl/libdl.x86.map b/libdl/libdl.x86.map index bde6cab38..1095fb326 100644 --- a/libdl/libdl.x86.map +++ b/libdl/libdl.x86.map @@ -33,11 +33,11 @@ LIBC_N { dlvsym; # introduced=24 } LIBC; -LIBC_OMR1 { # future +LIBC_OMR1 { # introduced=27 global: - __cfi_shadow_size; # future - __cfi_slowpath; # future - __cfi_slowpath_diag; # future + __cfi_shadow_size; # introduced=27 + __cfi_slowpath; # introduced=27 + __cfi_slowpath_diag; # introduced=27 } LIBC_N; LIBC_PLATFORM { diff --git a/libdl/libdl.x86_64.map b/libdl/libdl.x86_64.map index bde6cab38..1095fb326 100644 --- a/libdl/libdl.x86_64.map +++ b/libdl/libdl.x86_64.map @@ -33,11 +33,11 @@ LIBC_N { dlvsym; # introduced=24 } LIBC; -LIBC_OMR1 { # future +LIBC_OMR1 { # introduced=27 global: - __cfi_shadow_size; # future - __cfi_slowpath; # future - __cfi_slowpath_diag; # future + __cfi_shadow_size; # introduced=27 + __cfi_slowpath; # introduced=27 + __cfi_slowpath_diag; # introduced=27 } LIBC_N; LIBC_PLATFORM { -- cgit v1.2.3 From 157655dc6785923740e334478c4e2f1a392bade4 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Wed, 30 Aug 2017 11:30:53 +0900 Subject: Don't run disable_ld_config_file test on non-production devices The test always fails when run on non-production devices. Silence the expected failure. Bug: 64908138 Test: run CtsBionicTestCases on userdebug device. disable_ld_config_file test does not fail. Change-Id: Icd24a356dfbc62f540e3263070434a4fd065bfbc --- tests/dl_test.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/dl_test.cpp b/tests/dl_test.cpp index 857640ad6..aaf2c3742 100644 --- a/tests/dl_test.cpp +++ b/tests/dl_test.cpp @@ -16,6 +16,10 @@ #include +#if defined(__BIONIC__) +#include +#endif + #include #include #include @@ -226,6 +230,12 @@ TEST(dl, disable_ld_config_file) { // This test is only for CTS. return; } + std::string build_type = android::base::GetProperty("ro.build.type", "user"); + if (build_type == "userdebug" || build_type == "eng") { + // Skip the test for non production devices + return; + } + std::string error_message = "CANNOT LINK EXECUTABLE \"" + get_testlib_root() + "/ld_config_test_helper/ld_config_test_helper\": library \"ld_config_test_helper_lib1.so\" not found\n"; std::string helper = get_testlib_root() + "/ld_config_test_helper/ld_config_test_helper"; -- cgit v1.2.3