Merge "Don't #include <utils/Debug.h> from <utils/Flattenable.h>." am: af99e1e88a (80a8682f) · Commits · e / os / android_system_core

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