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

Commit 18aeaef1 authored by Priyanka Advani (xWF)'s avatar Priyanka Advani (xWF)
Browse files

Revert "Add ifdefs to compile out Parcel::Blob code"

Revert submission 34231615

Reason for revert: Droidmonitor created revert due to b/428745402. Will be verifying through ABTD before submission.

Fix: 428745402

Reverted changes: /q/submissionid:34231615

Change-Id: Ie1b496659d704310e4ccc115a4bf774901e89e1a
parent 264075c0
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ cc_library {
}

cc_library {
    name: "libbinder_rpc_no_legacy",
    name: "libbinder_rpc_no_blob",
    vendor_available: true,
    defaults: [
        "libbinder_common_defaults",
+2 −4
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#ifndef BINDER_DISABLE_BLOB
#include <sys/mman.h>
#endif // BINDER_DISABLE_BLOB
#include <sys/resource.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#include <algorithm>
@@ -3500,7 +3500,6 @@ size_t Parcel::getOpenAshmemSize() const

// --- Parcel::Blob ---

#ifndef BINDER_DISABLE_BLOB
Parcel::Blob::Blob() :
        mFd(-1), mData(nullptr), mSize(0), mMutable(false) {
}
@@ -3531,6 +3530,5 @@ void Parcel::Blob::clear() {
    mSize = 0;
    mMutable = false;
}
#endif // BINDER_DISABLE_BLOB

} // namespace android
+0 −3
Original line number Diff line number Diff line
@@ -98,9 +98,6 @@
    },
    {
      "name": "binderStatsPusherUnitTest"
    },
    {
      "name": "binderRpcTestNoLegacy"
    }
  ],
  "presubmit-large": [
+4 −8
Original line number Diff line number Diff line
@@ -1399,7 +1399,6 @@ private:

    size_t mReserved;

#ifndef BINDER_DISABLE_BLOB
    class Blob {
    public:
        LIBBINDER_EXPORTED Blob();
@@ -1419,7 +1418,6 @@ private:
        size_t mSize;
        bool mMutable;
    };
#endif // BINDER_DISABLE_BLOB

    #if defined(__clang__)
    #pragma clang diagnostic push
@@ -1471,7 +1469,6 @@ private:
    LIBBINDER_EXPORTED status_t read(FlattenableHelperInterface& val) const;

public:
#ifndef BINDER_DISABLE_BLOB
    class ReadableBlob : public Blob {
        friend class Parcel;
    public:
@@ -1484,7 +1481,6 @@ public:
    public:
        LIBBINDER_EXPORTED inline void* data() { return mData; }
    };
#endif // BINDER_DISABLE_BLOB

    /**
     * Returns the total amount of ashmem memory owned by this object.
+0 −11
Original line number Diff line number Diff line
@@ -547,17 +547,6 @@ cc_test {
    ],
}

cc_test {
    name: "binderRpcTestNoLegacy",
    defaults: [
        "binderRpcTest_defaults",
        "binderRpcTest_static_defaults",
    ],
    static_libs: [
        "libbinder_rpc_no_legacy",
    ],
}

cc_test {
    name: "binderRpcTestNoKernelAtAll",
    defaults: [