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

Commit e13c3f6f authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6182732 from b1f1a5d4 to rvc-release 

Change-Id: I4b69b40311ad3c278f4185e1aa99e92f5f9903e9
parents 0400f2c9 b1f1a5d4

cmds/dumpstate/dumpstate.cpp

+2 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ void add_mountinfo(); 
#define WLUTIL "/vendor/xbin/wlutil"

#define WMTRACE_DATA_DIR "/data/misc/wmtrace"

#define OTA_METADATA_DIR "/metadata/ota"

#define SNAPSHOTCTL_LOG_DIR "/data/misc/snapshotctl_log"



// TODO(narayan): Since this information has to be kept in sync

// with tombstoned, we should just put it in a common header.
@@ -1563,6 +1564,7 @@ Dumpstate::RunStatus Dumpstate::DumpstateDefaultAfterCritical() { 
    ds.AddDir(RECOVERY_DATA_DIR, true);

    ds.AddDir(UPDATE_ENGINE_LOG_DIR, true);

    ds.AddDir(LOGPERSIST_DATA_DIR, false);

    ds.AddDir(SNAPSHOTCTL_LOG_DIR, false);

    if (!PropertiesHelper::IsUserBuild()) {

        ds.AddDir(PROFILE_DATA_DIR_CUR, true);

        ds.AddDir(PROFILE_DATA_DIR_REF, true);

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
@@ -507,7 +507,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;