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

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

Change-Id: I5d76e2a875d9f638b7413466d13eb92eea511925
This commit is contained in:
Elliott Hughes 2020-08-17 20:48:00 +00:00 committed by Automerger Merge Worker
commit 80a8682fff

View file

@ -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 */