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

Commit 8f2b750d authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "libbinder: Consider 'VNDK + APEX' as system stable" am: 7f10d41d am:... 

Merge "libbinder: Consider 'VNDK + APEX' as system stable" am: 7f10d41d am: eb9c8bae am: e8ebd7d6
am: c1548fb9

Change-Id: I86cccc868fd7a66b970da23c3e0e99322ab33343
parents 794a7ea9 c1548fb9

libs/binder/Parcel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ void Parcel::updateWorkSourceRequestHeaderPosition() const { 
    }

}



#ifdef __ANDROID_VNDK__

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

constexpr int32_t kHeader = B_PACK_CHARS('V', 'N', 'D', 'R');

#else

constexpr int32_t kHeader = B_PACK_CHARS('S', 'Y', 'S', 'T');

libs/binder/include/binder/Stability.h

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ private: 
        VINTF = 0b111111,

    };



#ifdef __ANDROID_VNDK__

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

    static constexpr Level kLocalStability = Level::VENDOR;

#else

    static constexpr Level kLocalStability = Level::SYSTEM;

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

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


__BEGIN_DECLS



#ifdef __ANDROID_VNDK__

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



/**

 * This interface has the stability of the vendor image.
@@ -31,7 +31,7 @@ static inline void AIBinder_markCompilationUnitStability(AIBinder* binder) { 
    AIBinder_markVendorStability(binder);

}



#else  // ndef defined __ANDROID_VNDK__

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



/**

 * This interface has the stability of the system image.
@@ -42,7 +42,7 @@ static inline void AIBinder_markCompilationUnitStability(AIBinder* binder) { 
    AIBinder_markSystemStability(binder);

}



#endif  // ifdef __ANDROID_VNDK__

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



/**

 * This interface has system<->vendor stability