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

Commit 7898fd36 authored by Jooyung Han's avatar Jooyung Han Committed by android-build-merger
Browse files

Merge changes from topic "add-vndk-apex" am: a1ebc66b am: e75a2b37 

am: c448040b

Change-Id: Id28e99f1b7c5e2e3771d807bdd9487292d650209
parents 8f9fe1fd c448040b

libs/binder/Parcel.cpp

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

}



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

#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,

    };



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

#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 −6
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ enum { 
    FLAG_PRIVATE_VENDOR = 0x10000000,

};



#if defined(__ANDROID_APEX_COM_ANDROID_VNDK_CURRENT__) || \

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

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



enum {

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

}



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

       // !defined(__ANDROID_APEX__))

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



enum {

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

}



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

        // !defined(__ANDROID_APEX__))

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



/**

 * This interface has system<->vendor stability