Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "hwui: Fix multiple definitions of NativeFamilyBuilder" am: 579363b7c4 am: b9bf672193 am: 793b15bc1a am: 663b7ef76c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2576970

Change-Id: I61a657fb03a60c7a19a7663d116ef5e6875a5c28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-04 17:25:57 +00:00
committed by Automerger Merge Worker
parent 11288f5d9d 663b7ef76c
commit 87140bf707
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hwui/jni/FontFamily.cpp
View File

@@ -45,6 +45,7 @@
namespace android { namespace android {
namespace {
struct NativeFamilyBuilder { struct NativeFamilyBuilder {
NativeFamilyBuilder(uint32_t langId, int variant) NativeFamilyBuilder(uint32_t langId, int variant)
: langId(langId), variant(static_cast<minikin::FamilyVariant>(variant)) {} : langId(langId), variant(static_cast<minikin::FamilyVariant>(variant)) {}
@@ -53,6 +54,7 @@ struct NativeFamilyBuilder {
std::vector<std::shared_ptr<minikin::Font>> fonts; std::vector<std::shared_ptr<minikin::Font>> fonts;
std::vector<minikin::FontVariation> axes; std::vector<minikin::FontVariation> axes;
}; };
} // namespace
static inline NativeFamilyBuilder* toNativeBuilder(jlong ptr) { static inline NativeFamilyBuilder* toNativeBuilder(jlong ptr) {
return reinterpret_cast<NativeFamilyBuilder*>(ptr); return reinterpret_cast<NativeFamilyBuilder*>(ptr);

2
libs/hwui/jni/fonts/FontFamily.cpp
View File

@@ -29,9 +29,11 @@
namespace android { namespace android {
namespace {
struct NativeFamilyBuilder { struct NativeFamilyBuilder {
std::vector<std::shared_ptr<minikin::Font>> fonts; std::vector<std::shared_ptr<minikin::Font>> fonts;
}; };
} // namespace
static inline NativeFamilyBuilder* toBuilder(jlong ptr) { static inline NativeFamilyBuilder* toBuilder(jlong ptr) {
return reinterpret_cast<NativeFamilyBuilder*>(ptr); return reinterpret_cast<NativeFamilyBuilder*>(ptr);