Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1be31535 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents ca2def9b 6b97f7fc

libs/binder/ndk/include_platform/android/binder_manager.h

+4 −1
Original line number Diff line number Diff line
@@ -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 {

libs/binder/trusty/ndk/include/sys/cdefs.h

+1 −0
Original line number Diff line number Diff line
@@ -22,3 +22,4 @@ 
#define __END_DECLS __END_CDECLS



#define __INTRODUCED_IN(x) /* nothing on Trusty */

#define __INTRODUCED_IN_LLNDK(x) /* nothing on Trusty */