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

Commit d8e91f65 authored by Sergei Vasilinetc's avatar Sergei Vasilinetc Committed by Android (Google) Code Review
Browse files

Merge "Reland: Move text logic from jni to hwui level" into nyc-dev

parents da70ee48 dccca44f

core/jni/Android.mk

+0 −4
Original line number Diff line number Diff line
@@ -117,13 +117,10 @@ LOCAL_SRC_FILES:= \ 
    android/graphics/Interpolator.cpp \

    android/graphics/MaskFilter.cpp \

    android/graphics/Matrix.cpp \

    android/graphics/MinikinSkia.cpp \

    android/graphics/MinikinUtils.cpp \

    android/graphics/Movie.cpp \

    android/graphics/NinePatch.cpp \

    android/graphics/NinePatchPeeker.cpp \

    android/graphics/Paint.cpp \

    android/graphics/PaintImpl.cpp \

    android/graphics/Path.cpp \

    android/graphics/PathMeasure.cpp \

    android/graphics/PathEffect.cpp \
@@ -135,7 +132,6 @@ LOCAL_SRC_FILES:= \ 
    android/graphics/Shader.cpp \

    android/graphics/SurfaceTexture.cpp \

    android/graphics/Typeface.cpp \

    android/graphics/TypefaceImpl.cpp \

    android/graphics/Utils.cpp \

    android/graphics/Xfermode.cpp \

    android/graphics/YuvToJpegEncoder.cpp \

core/jni/android/graphics/Bitmap.cpp

+1 −1
Original line number Diff line number Diff line 
#define LOG_TAG "Bitmap"

#include "Bitmap.h"



#include "Paint.h"

#include "SkBitmap.h"

#include "SkPixelRef.h"

#include "SkImageEncoder.h"
@@ -18,6 +17,7 @@ 
#include "android_nio_utils.h"

#include "CreateJavaOutputStreamAdaptor.h"

#include <Caches.h>

#include <hwui/Paint.h>



#include "core_jni_helpers.h"

core/jni/android/graphics/Camera.cpp

+1 −1
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ 


#include "SkCamera.h"



#include "Canvas.h"

#include "GraphicsJNI.h"

#include <hwui/Canvas.h>



static jfieldID gNativeInstanceFieldID;

core/jni/android/graphics/CanvasProperty.cpp

+1 −1
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 


#include "jni.h"

#include "GraphicsJNI.h"

#include "Paint.h"

#include <core_jni_helpers.h>



#include <hwui/Paint.h>

#include <utils/RefBase.h>

#include <CanvasProperty.h>

core/jni/android/graphics/FontFamily.cpp

+2 −2
Original line number Diff line number Diff line
@@ -31,9 +31,9 @@ 
#include <androidfw/AssetManager.h>

#include "Utils.h"



#include "TypefaceImpl.h"

#include <hwui/MinikinSkia.h>

#include <hwui/TypefaceImpl.h>

#include <minikin/FontFamily.h>

#include "MinikinSkia.h"



#include <memory>