| commit | bc4c5f4e10d9e9db95ba879e29de852bbbdacba4 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Feb 06 22:15:30 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Feb 06 22:15:30 2021 +0000 |
| tree | b14919168eab4d67646cbccf1519bd6f6eed407c | |
| parent | aa85ac849f48efe26066b82c56095f01113b3793 [diff] | |
| parent | e87c05915d07288cbc20c1857190e9f6034f2a41 [diff] |
Merge "Remove __ANDROID_API__ #if checks." am: c8efe605ee am: 8a7bc561b6 am: e87c05915d Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1577904 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3218487f3022c54766d935876b4858c079c3ba11
diff --git a/libs/adbd_auth/include/adbd_auth.h b/libs/adbd_auth/include/adbd_auth.h index 8f834df..1dcf540 100644 --- a/libs/adbd_auth/include/adbd_auth.h +++ b/libs/adbd_auth/include/adbd_auth.h
@@ -26,7 +26,6 @@ #endif __BEGIN_DECLS -#if !defined(__ANDROID__) || __ANDROID_API__ >= 30 // The transport type of the device connection. enum AdbTransportType : int32_t { @@ -186,5 +185,4 @@ */ bool adbd_auth_supports_feature(AdbdAuthFeature feature); -#endif //!__ANDROID__ || __ANDROID_API__ >= 30 __END_DECLS