| commit | 61123354d4874fa88c90f26862ed063daaf4e8b5 | [log] [tgz] |
|---|---|---|
| author | Derek Wu <derekwu@google.com> | Wed Mar 27 09:45:32 2024 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Mar 27 09:45:32 2024 +0000 |
| tree | 18b9925da8a5a6c27f428ffb874f0efcdab2a012 | |
| parent | 408447fce39cbae8570eecad47e73c45c5c36107 [diff] | |
| parent | 705068dde6a8c4f2409f098eae7835ba1f2ebcd6 [diff] |
Merge "Add a jerk tracker to MotionPredictor" into main
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 */