diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-31 07:33:11 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-31 07:33:11 +0000 |
commit | c08f6e44fc15572210605b0ac7381142d875487e (patch) | |
tree | a636077be2b248e3e72303b0a67a9be08cca9493 | |
parent | c4ce2a39566902921cffc9786f8fff8ac92e8ddf (diff) | |
parent | 4ce79ba1543466f05eda3358dace4c1aec380d5c (diff) | |
download | bionic-c08f6e44fc15572210605b0ac7381142d875487e.tar.gz |
release-request-fd631211-effa-4885-9314-559fcbd0a094-for-git_oc-mr1-release-4308825 snap-temp-L52700000098265170
Change-Id: Idc68d45422e89822479078cb483654abafdb9d17
-rw-r--r-- | libdl/libdl.arm.map | 8 | ||||
-rw-r--r-- | libdl/libdl.arm64.map | 8 | ||||
-rw-r--r-- | libdl/libdl.map.txt | 8 | ||||
-rw-r--r-- | libdl/libdl.mips.map | 8 | ||||
-rw-r--r-- | libdl/libdl.mips64.map | 8 | ||||
-rw-r--r-- | libdl/libdl.x86.map | 8 | ||||
-rw-r--r-- | libdl/libdl.x86_64.map | 8 | ||||
-rw-r--r-- | tests/dl_test.cpp | 10 |
8 files changed, 38 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 { 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 <gtest/gtest.h> +#if defined(__BIONIC__) +#include <android-base/properties.h> +#endif + #include <dlfcn.h> #include <libgen.h> #include <limits.h> @@ -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"; |