diff options
| author | Colin Cross <ccross@android.com> | 2016-09-22 10:09:38 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2016-09-22 10:09:38 -0700 |
| commit | cafc05357c25160f68afc97c5c44dd5b77d0fff8 (patch) | |
| tree | d2fb49f5ac75741bdebd70a9d55dbb8cef322165 | |
| parent | 59acc059a623268b0eaac54d469a95e09efd81a5 (diff) | |
Remove has_trivial_move trait from StringPool types
StringPool:entry* are not trivially moveable, as they contain Vector<>
objects. The data in Vector<> is trivially moveable, but Vector<>
itself is a dynamic type with a vtable, which is not trivially
moveable.
Impact on aapt for frameworks-res is negligible, ~3%.
Bug: 31595853
Test: m -j framework-res
Change-Id: I562a46ef8934aed7aab5c5377db53d9cf64a08b9
| -rw-r--r-- | tools/aapt/StringPool.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/tools/aapt/StringPool.h b/tools/aapt/StringPool.h index 625b0bfb3832..253bcca4f507 100644 --- a/tools/aapt/StringPool.h +++ b/tools/aapt/StringPool.h @@ -12,7 +12,6 @@ #include <androidfw/ResourceTypes.h> #include <utils/String16.h> -#include <utils/TypeHelpers.h> #include <sys/types.h> #include <sys/stat.h> @@ -179,13 +178,5 @@ private: Vector<size_t> mOriginalPosToNewPos; }; -// The entry types are trivially movable because all fields they contain, including -// the vectors and strings, are trivially movable. -namespace android { - ANDROID_TRIVIAL_MOVE_TRAIT(StringPool::entry); - ANDROID_TRIVIAL_MOVE_TRAIT(StringPool::entry_style_span); - ANDROID_TRIVIAL_MOVE_TRAIT(StringPool::entry_style); -}; - #endif |