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

Commit 00a2b1f4 authored by Steven Moreland's avatar Steven Moreland Committed by Gerrit Code Review
Browse files

Merge changes I896e0bc8,I27231c4f 

* changes:
  libbinder_ndk: use __ANDROID_VENDOR__
  Partial: Reland "libbinder: remove __ANDROID_APEX__ stability diff"
parents f369d9ac a8ad32b7

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

+3 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ enum { 
    FLAG_PRIVATE_VENDOR = 0x10000000,

};



#if defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__)

#if defined(__ANDROID_VENDOR__)



enum {

    FLAG_PRIVATE_LOCAL = FLAG_PRIVATE_VENDOR,
@@ -45,7 +45,7 @@ static inline void AIBinder_markCompilationUnitStability(AIBinder* binder) { 
    AIBinder_markVendorStability(binder);

}



#else  // defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__)

#else  // defined(__ANDROID_VENDOR__)



enum {

    FLAG_PRIVATE_LOCAL = 0,
@@ -62,7 +62,7 @@ static inline void AIBinder_markCompilationUnitStability(AIBinder* binder) { 
    AIBinder_markSystemStability(binder);

}



#endif  // defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__)

#endif  // defined(__ANDROID_VENDOR__)



/**

 * This interface has system<->vendor stability