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

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

Change-Id: I4e697764ed29be985b4f81e2dc5c9c5769d78579
parents e4713cf4 7f10d41d

libs/binder/Parcel.cpp

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

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,

    };

    };





#ifdef __ANDROID_VNDK__

#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 −3
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ 




__BEGIN_DECLS

__BEGIN_DECLS





#ifdef __ANDROID_VNDK__

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





/**

/**

 * This interface has the stability of the vendor image.

 * This interface has the stability of the vendor image.
@@ -31,7 +31,7 @@ static inline void AIBinder_markCompilationUnitStability(AIBinder* binder) { 
    AIBinder_markVendorStability(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.

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

    AIBinder_markSystemStability(binder);

}

}





#endif  // ifdef __ANDROID_VNDK__

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





/**

/**

 * This interface has system<->vendor stability

 * This interface has system<->vendor stability