Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87140bf7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "hwui: Fix multiple definitions of NativeFamilyBuilder" am: 579363b7... 

Merge "hwui: Fix multiple definitions of NativeFamilyBuilder" am: 579363b7 am: b9bf6721 am: 793b15bc am: 663b7ef7

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



Change-Id: I61a657fb03a60c7a19a7663d116ef5e6875a5c28
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 11288f5d 663b7ef7

libs/hwui/jni/FontFamily.cpp

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 


namespace android {



namespace {

struct NativeFamilyBuilder {

    NativeFamilyBuilder(uint32_t langId, int 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<minikin::FontVariation> axes;

};

}  // namespace



static inline NativeFamilyBuilder* toNativeBuilder(jlong ptr) {

    return reinterpret_cast<NativeFamilyBuilder*>(ptr);

libs/hwui/jni/fonts/FontFamily.cpp

+2 −0
Original line number Diff line number Diff line
@@ -29,9 +29,11 @@ 


namespace android {



namespace {

struct NativeFamilyBuilder {

    std::vector<std::shared_ptr<minikin::Font>> fonts;

};

}  // namespace



static inline NativeFamilyBuilder* toBuilder(jlong ptr) {

    return reinterpret_cast<NativeFamilyBuilder*>(ptr);