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

Commit bb7a6420 authored by Raph Levien's avatar Raph Levien Committed by Android (Google) Code Review
Browse files

Merge "Fix build breakage"

parents d4f50f21 3d528c40

core/jni/android/graphics/FontFamily.cpp

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <androidfw/AssetManager.h>

#include "Utils.h"



#include "TypefaceImpl.h"

#include <minikin/FontFamily.h>

#include "MinikinSkia.h"

core/jni/android/graphics/GraphicsJNI.h

+4 −1
Original line number Diff line number Diff line
@@ -8,13 +8,16 @@ 
#include "SkPoint.h"

#include "SkRect.h"

#include "SkImageDecoder.h"

#include "TypefaceImpl.h"

#include <jni.h>



class SkBitmapRegionDecoder;

class SkCanvas;

class SkPaint;



namespace android {

class TypefaceImpl;

}



class GraphicsJNI {

public:

    enum BitmapCreateFlags {

core/jni/android/graphics/Paint.cpp

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <minikin/Layout.h>

#include "MinikinSkia.h"

#include "MinikinUtils.h"

#include "TypefaceImpl.h"



// temporary for debugging

#include <Caches.h>