diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-03-26 22:25:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-26 22:25:47 +0000 |
| commit | 1be315355bab1ef6b1df157370199302b672630a (patch) | |
| tree | f534545a924efd10b1b621a80be7963aa275fab5 | |
| parent | ca2def9bf4997f086d525c7194aa96b331d47613 (diff) | |
| parent | 6b97f7fce858cec5e7a343fc6e20e2a4f747602b (diff) | |
| download | native-1be315355bab1ef6b1df157370199302b672630a.tar.gz | |
Merge "libbinder_ndk: Shim llndk-versioning on Trusty" into main
| -rw-r--r-- | libs/binder/ndk/include_platform/android/binder_manager.h | 5 | ||||
| -rw-r--r-- | libs/binder/trusty/ndk/include/sys/cdefs.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libs/binder/ndk/include_platform/android/binder_manager.h b/libs/binder/ndk/include_platform/android/binder_manager.h index 52edae4a38..c665ad82ad 100644 --- a/libs/binder/ndk/include_platform/android/binder_manager.h +++ b/libs/binder/ndk/include_platform/android/binder_manager.h @@ -18,9 +18,12 @@ #include <android/binder_ibinder.h> #include <android/binder_status.h> -#include <android/llndk-versioning.h> #include <sys/cdefs.h> +#ifndef __TRUSTY__ +#include <android/llndk-versioning.h> +#endif + __BEGIN_DECLS enum AServiceManager_AddServiceFlag : uint32_t { diff --git a/libs/binder/trusty/ndk/include/sys/cdefs.h b/libs/binder/trusty/ndk/include/sys/cdefs.h index 6a48d2b776..eabfe603bd 100644 --- a/libs/binder/trusty/ndk/include/sys/cdefs.h +++ b/libs/binder/trusty/ndk/include/sys/cdefs.h @@ -22,3 +22,4 @@ #define __END_DECLS __END_CDECLS #define __INTRODUCED_IN(x) /* nothing on Trusty */ +#define __INTRODUCED_IN_LLNDK(x) /* nothing on Trusty */ |