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

Commit e6bf9ec7 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Automerger Merge Worker
Browse files

Merge "Binder: Flattenable is no longer a hard dependency" into main am: f334e5da am: 7eaf64f8 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2807155



Change-Id: Ic6c5f40f10045ee92f434ab1e3497d3cbb09df80
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f4956980 7eaf64f8

libs/binder/Parcel.cpp

+0 −1
Original line number Diff line number Diff line
@@ -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>

libs/binder/include/binder/Parcel.h

+0 −1
Original line number Diff line number Diff line
@@ -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>

libs/binder/tests/binderLibTest.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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>

libs/binder/tests/binderSafeInterfaceTest.cpp

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <gtest/gtest.h>

#pragma clang diagnostic pop



#include <utils/Flattenable.h>

#include <utils/LightRefBase.h>

#include <utils/NativeHandle.h>

libs/binder/tests/parcel_fuzzer/binder.cpp

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <binder/ParcelableHolder.h>

#include <binder/PersistableBundle.h>

#include <binder/Status.h>

#include <utils/Flattenable.h>



#include "../../Utils.h"