diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-05-05 00:44:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 00:44:17 +0000 |
| commit | 2c81af674a1edab62bc23e8317a37d0332169fae (patch) | |
| tree | 1d912c13b88a92d965670d0079be369f82095917 | |
| parent | 4420d4c01984f2ca73858ecd85816249934fe152 (diff) | |
| parent | 49f7f10f62a4da55e558ccfc43541fbbc97e7d3f (diff) | |
Merge "Add API constant for S." am: 49f7f10f62
Change-Id: I3ac5da53252b9a03172f487d1c759335ecf26039
| -rw-r--r-- | libc/include/android/api-level.h | 3 | ||||
| -rw-r--r-- | libc/libc.map.txt | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libc/include/android/api-level.h b/libc/include/android/api-level.h index 1b8af78cd..50cb61a6b 100644 --- a/libc/include/android/api-level.h +++ b/libc/include/android/api-level.h @@ -110,6 +110,9 @@ __BEGIN_DECLS /** Names the "R" API level (30), for comparison against `__ANDROID_API__`. */ #define __ANDROID_API_R__ 30 +/** Names the "S" API level (31), for comparison against `__ANDROID_API__`. */ +#define __ANDROID_API_S__ 31 + /** * Returns the `targetSdkVersion` of the caller, or `__ANDROID_API_FUTURE__` * if there is no known target SDK version (for code not running in the diff --git a/libc/libc.map.txt b/libc/libc.map.txt index 228477588..10732a12d 100644 --- a/libc/libc.map.txt +++ b/libc/libc.map.txt @@ -1550,7 +1550,7 @@ LIBC_R { # introduced=R _Unwind_VRS_Set; # apex llndk arm } LIBC_Q; -LIBC_S { # introduced=31 +LIBC_S { # introduced=S global: ffsl; ffsll; |