diff options
author | Elliott Hughes <enh@google.com> | 2021-02-04 17:34:30 -0800 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2021-02-04 17:34:30 -0800 |
commit | 8df540763119d5f1107032c97affc81edac75579 (patch) | |
tree | b44921791e7ef8f5e4c6f3e781958811a1f1eb4a /pairing_auth | |
parent | c5681f050ba4a6857ae2fea05774af506a729a25 (diff) | |
download | adb-8df540763119d5f1107032c97affc81edac75579.tar.gz |
Remove __ANDROID_API__ #if checks.android-s-preview-1
__INTRODUCED_IN() does the right thing automatically now.
Bug: http://b/178449269
Test: treehugger
Change-Id: I71deac71b8d8b7b99e5ea0b93a9401a536101042
Diffstat (limited to 'pairing_auth')
-rw-r--r-- | pairing_auth/include/adb/pairing/pairing_auth.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/pairing_auth/include/adb/pairing/pairing_auth.h b/pairing_auth/include/adb/pairing/pairing_auth.h index 9ef97e26..ee0412fb 100644 --- a/pairing_auth/include/adb/pairing/pairing_auth.h +++ b/pairing_auth/include/adb/pairing/pairing_auth.h @@ -25,7 +25,6 @@ #endif __BEGIN_DECLS -#if !defined(__ANDROID__) || __ANDROID_API__ >= 30 /** * PairingAuthCtx is a wrapper around the SPAKE2 protocol + cipher initialization @@ -182,5 +181,4 @@ size_t pairing_auth_safe_decrypted_size(PairingAuthCtx* ctx, const uint8_t* buf, bool pairing_auth_decrypt(PairingAuthCtx* ctx, const uint8_t* inbuf, size_t inlen, uint8_t* outbuf, size_t* outlen) __INTRODUCED_IN(30); -#endif //!__ANDROID__ || __ANDROID_API__ >= 30 __END_DECLS |