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

Commit 86ae9e79 authored by Steven Moreland's avatar Steven Moreland
Browse files

libbinder_ndk: C++ headers aren't C-compatible. 

These were allowed to be included in C code, but weren't useful.

Bug: 111445392
Test: atest android.binder.cts
Change-Id: Ib26d784076ed99c4270e2bdb10480aaf472ef01e
parent e3d0958b

libs/binder/ndk/include_ndk/android/binder_auto_utils.h

+1 −5
Original line number Original line Diff line number Diff line
@@ -31,10 +31,8 @@ 
#include <android/binder_status.h>

#include <android/binder_status.h>





#include <assert.h>

#include <assert.h>

#include <unistd.h>



#ifdef __cplusplus





#include <unistd.h>

#include <cstddef>

#include <cstddef>





namespace ndk {

namespace ndk {
@@ -252,6 +250,4 @@ class ScopedFileDescriptor : public ScopedAResource<int, int, close, -1> { 




}  // namespace ndk

}  // namespace ndk





#endif  // __cplusplus



/** @} */
 
/** @} */

libs/binder/ndk/include_ndk/android/binder_interface_utils.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -32,8 +32,6 @@ 




#include <assert.h>

#include <assert.h>





#ifdef __cplusplus



#include <memory>

#include <memory>

#include <mutex>

#include <mutex>
@@ -173,6 +171,4 @@ SpAIBinder BpCInterface<INTERFACE>::asBinder() { 




}  // namespace ndk

}  // namespace ndk





#endif  // __cplusplus



/** @} */
 
/** @} */

libs/binder/ndk/include_ndk/android/binder_parcel_utils.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -28,8 +28,6 @@ 




#include <android/binder_parcel.h>

#include <android/binder_parcel.h>





#ifdef __cplusplus



#include <string>

#include <string>

#include <vector>

#include <vector>
@@ -327,6 +325,4 @@ static inline binder_status_t AParcel_resizeVector(const AParcel* parcel, std::v 




}  // namespace ndk

}  // namespace ndk





#endif  // __cplusplus



/** @} */
 
/** @} */