| commit | 6b97f7fce858cec5e7a343fc6e20e2a4f747602b | [log] [tgz] |
|---|---|---|
| author | Andrei Homescu <ahomescu@google.com> | Fri Mar 22 22:22:15 2024 +0000 |
| committer | Andrei Homescu <ahomescu@google.com> | Fri Mar 22 22:23:43 2024 +0000 |
| tree | f534545a924efd10b1b621a80be7963aa275fab5 | |
| parent | ca2def9bf4997f086d525c7194aa96b331d47613 [diff] |
libbinder_ndk: Shim llndk-versioning on Trusty Trusty does not provide the llndk-versioning.h header, so work around it by providing a no-op alternative to __INTRODUCED_IN_LLNDK Bug: 242243245 Test: build Trusty Change-Id: I9e13eb3d890d7cf4183468b822e4d5e4f9939006
diff --git a/libs/binder/ndk/include_platform/android/binder_manager.h b/libs/binder/ndk/include_platform/android/binder_manager.h index 52edae4..c665ad8 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 6a48d2b..eabfe60 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 */