summaryrefslogtreecommitdiff
path: root/libs/androidfw/BackupData.cpp
diff options
context:
space:
mode:
author Tomislav Novak <tnovak@meta.com> 2023-05-02 14:35:29 -0700
committer Tomislav Novak <tnovak@meta.com> 2023-05-02 14:38:51 -0700
commite537b18e8efe0c4cc510e0e34392e94c7dda4cdc (patch)
tree923bb41271b56d48432617aef5cece1c0ca40aa2 /libs/androidfw/BackupData.cpp
parentc2fa03fc8765ab1a35d440784c2a9aaaab9109b6 (diff)
hwui: Fix multiple definitions of NativeFamilyBuilder
There are two _different_ definitions of the NativeFamilyBuilder class, one in jni/FontFamily.cpp and the other in jni/fonts/FontFamily.cpp, violating the one-definition rule. Make them local by moving to an anonymous namespace. This is an issue in non-optimized builds where ~NativeFamilyBuilder isn't inlined, so the wrong destructor ends up being called: ``` (gdb) bt [...] #3 0x0000007292c44a8c in std::__1::vector<minikin::FontVariation, std::__1::allocator<minikin::FontVariation> >::~vector () #4 0x0000007292c44a54 in android::NativeFamilyBuilder::~NativeFamilyBuilder () #8 0x0000007292c64cec in android::FontFamily_Builder_build () ``` (note that the struct used by FontFamily_Builder_build() doesn't have the vector<minikin::FontVariation> field) Test: add "-O0" to hwui cflags and verify that system_server no longer hangs on startup Signed-off-by: Tomislav Novak <tnovak@meta.com> Change-Id: Ic071a7c00a9b2f632b6f56877f54c6a58eb38965
Diffstat (limited to 'libs/androidfw/BackupData.cpp')
0 files changed, 0 insertions, 0 deletions