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

Commit c448040b 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

Change-Id: I4ac8aab10321e26e558d71e61376aa712f177c95
parents 01c0c314 e75a2b37

libs/binder/Parcel.cpp

+1 −1
Original line number Original line 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');

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

#else

#else

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

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

libs/binder/include/binder/Stability.h

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

        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;

    static constexpr Level kLocalStability = Level::VENDOR;

#else

#else

    static constexpr Level kLocalStability = Level::SYSTEM;

    static constexpr Level kLocalStability = Level::SYSTEM;

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

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

    FLAG_PRIVATE_VENDOR = 0x10000000,

};

};





#if defined(__ANDROID_APEX_COM_ANDROID_VNDK_CURRENT__) || \

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

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





enum {

enum {

    FLAG_PRIVATE_LOCAL = FLAG_PRIVATE_VENDOR,

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

    AIBinder_markVendorStability(binder);

}

}





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

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

       // !defined(__ANDROID_APEX__))





enum {

enum {

    FLAG_PRIVATE_LOCAL = 0,

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

    AIBinder_markSystemStability(binder);

}

}





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

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

        // !defined(__ANDROID_APEX__))





/**

/**

 * This interface has system<->vendor stability

 * This interface has system<->vendor stability