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

Commit a304bb12 authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "Don't #include <utils/Debug.h> from <utils/Flattenable.h>." am:... 

Merge "Don't #include <utils/Debug.h> from <utils/Flattenable.h>." am: af99e1e8 am: 80a8682f am: ca308a09

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1402848

Change-Id: I18508ebf0605e65ff05c408ca009a1e3a09d9c45
parents ce252934 ca308a09

libutils/include/utils/Flattenable.h

+1 −5
Original line number Original line Diff line number Diff line
@@ -14,8 +14,7 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





#ifndef ANDROID_UTILS_FLATTENABLE_H

#pragma once

#define ANDROID_UTILS_FLATTENABLE_H





// DO NOT USE: please use parcelable instead

// DO NOT USE: please use parcelable instead

// This code is deprecated and will not be supported via AIDL code gen. For data

// This code is deprecated and will not be supported via AIDL code gen. For data
@@ -25,7 +24,6 @@ 
#include <string.h>

#include <string.h>

#include <sys/types.h>

#include <sys/types.h>

#include <utils/Errors.h>

#include <utils/Errors.h>

#include <utils/Debug.h>





#include <type_traits>

#include <type_traits>
@@ -217,5 +215,3 @@ public: 
};

};





}  // namespace android
 
}  // namespace android
 


#endif /* ANDROID_UTILS_FLATTENABLE_H */