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

Commit f46a4a1c authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Android (Google) Code Review
Browse files

Merge "Reduce the exposure of the graphics headers."

parents ee282820 eec1b865

core/jni/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ cc_library_shared { 
                "android_view_InputEventReceiver.cpp",

                "android_view_InputEventSender.cpp",

                "android_view_InputQueue.cpp",

                "android_view_FrameMetricsObserver.cpp",

                "android_view_KeyCharacterMap.cpp",

                "android_view_KeyEvent.cpp",

                "android_view_MotionEvent.cpp",
@@ -424,9 +425,9 @@ cc_library_static { 
        android: {

            srcs: [ // sources that depend on android only libraries

                "android/graphics/apex/android_canvas.cpp",

                "android/graphics/apex/renderthread.cpp",

                "android/graphics/apex/jni_runtime.cpp",



                "android_view_FrameMetricsObserver.cpp",

                "android_view_TextureLayer.cpp",

                "android_view_ThreadedRenderer.cpp",

                "android/graphics/BitmapRegionDecoder.cpp",

core/jni/android/graphics/Bitmap.cpp

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include "SkWebpEncoder.h"



#include "android_os_Parcel.h"

#include "android_util_Binder.h"

#include "android_nio_utils.h"

#include "CreateJavaOutputStreamAdaptor.h"

#include <hwui/Paint.h>

core/jni/android/graphics/BitmapRegionDecoder.cpp

+0 −5
Original line number Diff line number Diff line
@@ -25,18 +25,13 @@ 
#include "SkBitmapRegionDecoder.h"

#include "SkCodec.h"

#include "SkData.h"

#include "SkUtils.h"

#include "SkPixelRef.h"

#include "SkStream.h"



#include "android_nio_utils.h"

#include "android_util_Binder.h"

#include "core_jni_helpers.h"



#include <HardwareBitmapUploader.h>

#include <nativehelper/JNIHelp.h>

#include <androidfw/Asset.h>

#include <binder/Parcel.h>

#include <jni.h>

#include <sys/stat.h>

core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include "Utils.h"



#include <nativehelper/JNIHelp.h>

#include <log/log.h>

#include <memory>



static jmethodID    gInputStream_readMethodID;

core/jni/android/graphics/Typeface.cpp

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
#include <nativehelper/ScopedPrimitiveArray.h>

#include <nativehelper/ScopedUtfChars.h>

#include "SkTypeface.h"

#include <android_runtime/android_util_AssetManager.h>

#include <androidfw/AssetManager.h>

#include <hwui/Typeface.h>

#include <minikin/FontFamily.h>

#include <minikin/SystemFonts.h>