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

Commit 328c66bb authored by Jooyung Han's avatar Jooyung Han Committed by android-build-merger
Browse files

Merge changes from topic "add-vndk-apex" am: 3453a37f 

am: a3022d4b

Change-Id: Ic1862e1a3fbc49182809118a66f3ce86e053e520
parents b357269c a3022d4b

libs/binder/Parcel.cpp

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

}



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

#if defined(__ANDROID_APEX_COM_ANDROID_VNDK_CURRENT__) || (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,

    };



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

#if defined(__ANDROID_APEX_COM_ANDROID_VNDK_CURRENT__) || (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

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


__BEGIN_DECLS



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

#if defined(__ANDROID_APEX_COM_ANDROID_VNDK_CURRENT__) || \

        (defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__))



/**

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

}



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

#else  // defined(__ANDROID_APEX_COM_ANDROID_VNDK_CURRENT__) || (defined(__ANDROID_VNDK__) &&

       // !defined(__ANDROID_APEX__))



/**

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

}



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

#endif  // defined(__ANDROID_APEX_COM_ANDROID_VNDK_CURRENT__) || (defined(__ANDROID_VNDK__) &&

        // !defined(__ANDROID_APEX__))



/**

 * This interface has system<->vendor stability