Fix API level of cfi_* symbols to 27
API level of O-MR1 is 27.
Bug: 63053790
Test: bionic tests passes
Change-Id: I78f0bd8af106954326394d60bf4d0cf5e10f7f17
diff --git a/libdl/libdl.arm.map b/libdl/libdl.arm.map
index 9fc9d23..628e20d 100644
--- a/libdl/libdl.arm.map
+++ b/libdl/libdl.arm.map
@@ -34,11 +34,11 @@
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 bde6cab..1095fb3 100644
--- a/libdl/libdl.arm64.map
+++ b/libdl/libdl.arm64.map
@@ -33,11 +33,11 @@
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 d1f4ab8..985082e 100644
--- a/libdl/libdl.map.txt
+++ b/libdl/libdl.map.txt
@@ -33,11 +33,11 @@
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 bde6cab..1095fb3 100644
--- a/libdl/libdl.mips.map
+++ b/libdl/libdl.mips.map
@@ -33,11 +33,11 @@
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 bde6cab..1095fb3 100644
--- a/libdl/libdl.mips64.map
+++ b/libdl/libdl.mips64.map
@@ -33,11 +33,11 @@
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 bde6cab..1095fb3 100644
--- a/libdl/libdl.x86.map
+++ b/libdl/libdl.x86.map
@@ -33,11 +33,11 @@
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 bde6cab..1095fb3 100644
--- a/libdl/libdl.x86_64.map
+++ b/libdl/libdl.x86_64.map
@@ -33,11 +33,11 @@
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 {