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

Commit a8ad32b7 authored by Steven Moreland's avatar Steven Moreland
Browse files

libbinder_ndk: use __ANDROID_VENDOR__ 

This library is used by the product partition, which also defines
__ANDROID_VNDK__. Previously, since the only relevant library here was
the gsi service, we excluded APEXes from this test. However, this leaves
regular product binaries able to talk to vendor over unstable APIs.

Bug: 180646847
Test: binderStabilityTest (is in TH)
Change-Id: I896e0bc8aec3c35f43df2d5fdd03ac92fcc84c30
parent aeff056c

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