diff options
| author | 2023-10-31 20:07:29 +0000 | |
|---|---|---|
| committer | 2023-10-31 20:07:29 +0000 | |
| commit | 7eaf64f8ed51cd471e03c5a0dae380bee1ca00ca (patch) | |
| tree | c930f8ff6ce26f9da89ba2565cc4dffced35ffa9 | |
| parent | 156adea4c135c99a3876fbd9fbe368fb42a33787 (diff) | |
| parent | f334e5da6dbd002be39d085d70c7ebcd5a268f36 (diff) | |
Merge "Binder: Flattenable is no longer a hard dependency" into main am: f334e5da6d
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2807155
Change-Id: I072330e96cd19c21066a38427aebd96b1ca17cd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/binder/Parcel.cpp | 1 | ||||
| -rw-r--r-- | libs/binder/include/binder/Parcel.h | 1 | ||||
| -rw-r--r-- | libs/binder/tests/binderLibTest.cpp | 1 | ||||
| -rw-r--r-- | libs/binder/tests/binderSafeInterfaceTest.cpp | 1 | ||||
| -rw-r--r-- | libs/binder/tests/parcel_fuzzer/binder.cpp | 1 |
5 files changed, 3 insertions, 2 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index 17bdc455be..81a07d3859 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -43,7 +43,6 @@ #ifndef BINDER_DISABLE_BLOB #include <cutils/ashmem.h> #endif -#include <utils/Flattenable.h> #include <utils/Log.h> #include <utils/String16.h> #include <utils/String8.h> diff --git a/libs/binder/include/binder/Parcel.h b/libs/binder/include/binder/Parcel.h index 98d12bb120..6961abc64b 100644 --- a/libs/binder/include/binder/Parcel.h +++ b/libs/binder/include/binder/Parcel.h @@ -33,7 +33,6 @@ #include <utils/RefBase.h> #include <utils/String16.h> #include <utils/Vector.h> -#include <utils/Flattenable.h> #include <binder/IInterface.h> #include <binder/Parcelable.h> diff --git a/libs/binder/tests/binderLibTest.cpp b/libs/binder/tests/binderLibTest.cpp index 341e9ce5ec..659943a718 100644 --- a/libs/binder/tests/binderLibTest.cpp +++ b/libs/binder/tests/binderLibTest.cpp @@ -40,6 +40,7 @@ #include <binder/IServiceManager.h> #include <binder/RpcServer.h> #include <binder/RpcSession.h> +#include <utils/Flattenable.h> #include <linux/sched.h> #include <sys/epoll.h> diff --git a/libs/binder/tests/binderSafeInterfaceTest.cpp b/libs/binder/tests/binderSafeInterfaceTest.cpp index 1c13866626..cbbbe74bb5 100644 --- a/libs/binder/tests/binderSafeInterfaceTest.cpp +++ b/libs/binder/tests/binderSafeInterfaceTest.cpp @@ -28,6 +28,7 @@ #include <gtest/gtest.h> #pragma clang diagnostic pop +#include <utils/Flattenable.h> #include <utils/LightRefBase.h> #include <utils/NativeHandle.h> diff --git a/libs/binder/tests/parcel_fuzzer/binder.cpp b/libs/binder/tests/parcel_fuzzer/binder.cpp index 416ffad466..ffeca2d13e 100644 --- a/libs/binder/tests/parcel_fuzzer/binder.cpp +++ b/libs/binder/tests/parcel_fuzzer/binder.cpp @@ -25,6 +25,7 @@ #include <binder/ParcelableHolder.h> #include <binder/PersistableBundle.h> #include <binder/Status.h> +#include <utils/Flattenable.h> #include "../../Utils.h" |