Merge "libbinder_ndk: Shim llndk-versioning on Trusty" into main

Treehugger Robot · Gerrit Code Review · commit 1be315355bab · 2024-03-26T22:25:47.000Z
diff --git 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
@@ -22,3 +22,4 @@
 #define __END_DECLS __END_CDECLS
 
 #define __INTRODUCED_IN(x) /* nothing on Trusty */
+#define __INTRODUCED_IN_LLNDK(x) /* nothing on Trusty */

Original file line number	Diff line number	Diff line change
`@@ -22,3 +22,4 @@`
`22`	`22`	`#define __END_DECLS __END_CDECLS`
`23`	`23`
`24`	`24`	`#define __INTRODUCED_IN(x) /* nothing on Trusty */`
	`25`	`+#define __INTRODUCED_IN_LLNDK(x) /* nothing on Trusty */`