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

Commit dadfbdf7 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge changes I896e0bc8,I27231c4f am: 00a2b1f4 am: 93169e30 am: fc726abd 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1653861

Change-Id: Ie13c72ea8c23779a0348c071be8c509e0379ed32
parents caf62fae fc726abd

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

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

};



// TODO(b/180646847): __ANDROID_APEX__ here is what allows product partition to

// talk to system.

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

#if defined(__ANDROID_VENDOR__)



enum {

    FLAG_PRIVATE_LOCAL = FLAG_PRIVATE_VENDOR,
@@ -47,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,
@@ -64,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