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

Commit a4abf8f7 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Cleanup: remove VNDK APEX exception from binder" am: dc267c5b am: c4048a59 

Change-Id: I4cd8a178b8744d55e85c54dffde36b70a418aa30
parents a2747b2a c4048a59

libs/binder/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ cc_library { 
    // or dessert updates. Instead, apex users should use libbinder_ndk.

    apex_available: [

        "//apex_available:platform",

        "com.android.vndk.current",

        // TODO(b/139016109) remove these three

        "com.android.media.swcodec",

        "test_com.android.media.swcodec",

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/ProcessState.cpp

+5 −5
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ ProcessState::ProcessState(const char *driver) 
{



// TODO(b/139016109): enforce in build system

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

#if defined(__ANDROID_APEX__)

    LOG_ALWAYS_FATAL("Cannot use libbinder in APEX (only system.img libbinder) since it is not stable.");

#endif

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,
@@ -64,8 +62,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