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

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

Merge changes from topic "HWUI_JNI" 

* changes:
  Export symbols for the newly exposed APEX/internal headers
  Remove dependence on libandroid_runtime from Bitmap.cpp
  Update Region.cpp to use AParcel NDK APIs
  Cleanup header and build targets for libhwui clients.
  Remove dependencies on headers outside UI module
  Cleanup LOG_TAG when bundled in HWUI
  Move android.graphics JNI & APEX files into HWUI
parents 1ab8e44c 2173ea28

core/jni/Android.bp

+1 −161
Original line number Diff line number Diff line
@@ -52,20 +52,11 @@ cc_library_shared { 
        "system/media/private/camera/include",

    ],



    static_libs: [

        "libandroid_graphics",

    ],



    whole_static_libs: ["libandroid_graphics"],



    export_static_lib_headers: ["libandroid_graphics"],



    shared_libs: [

        "libbase",

        "libcutils",

        "libharfbuzz_ng",

        "libhwui",

        "libjpeg",

        "liblog",

        "libminikin",

        "libnativehelper",
@@ -107,6 +98,7 @@ cc_library_shared { 
                "android_database_SQLiteGlobal.cpp",

                "android_database_SQLiteDebug.cpp",

                "android_graphics_GraphicBuffer.cpp",

                "android_graphics_SurfaceTexture.cpp",

                "android_view_CompositionSamplingListener.cpp",

                "android_view_DisplayEventReceiver.cpp",

                "android_view_InputChannel.cpp",
@@ -182,8 +174,6 @@ cc_library_shared { 
                "android_hardware_UsbRequest.cpp",

                "android_hardware_location_ActivityRecognitionHardware.cpp",

                "android_util_FileObserver.cpp",

                "android/graphics/GraphicsStatsService.cpp",

                "android/graphics/SurfaceTexture.cpp",

                "android/opengl/poly_clip.cpp", // TODO: .arm

                "android/opengl/util.cpp",

                "android_server_NetworkManagementSocketTagger.cpp",
@@ -324,153 +314,3 @@ cc_library_shared { 
        },

    },

}
 


cc_library_static {

    name: "libandroid_graphics",

    host_supported: true,

    cflags: [

        "-Wno-unused-parameter",

        "-Wno-non-virtual-dtor",

        "-Wno-maybe-uninitialized",

        "-Wno-parentheses",



        "-DGL_GLEXT_PROTOTYPES",

        "-DEGL_EGLEXT_PROTOTYPES",



        "-DU_USING_ICU_NAMESPACE=0",



        "-Wall",

        "-Werror",

        "-Wno-error=deprecated-declarations",

        "-Wunused",

        "-Wunreachable-code",

    ],



    cppflags: ["-Wno-conversion-null"],



    srcs: [

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

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

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



        "android_graphics_animation_NativeInterpolatorFactory.cpp",

        "android_graphics_animation_RenderNodeAnimator.cpp",

        "android_graphics_Canvas.cpp",

        "android_graphics_ColorSpace.cpp",

        "android_graphics_drawable_AnimatedVectorDrawable.cpp",

        "android_graphics_drawable_VectorDrawable.cpp",

        "android_graphics_HardwareRendererObserver.cpp",

        "android_graphics_Picture.cpp",

        "android_nio_utils.cpp",

        "android_view_DisplayListCanvas.cpp",

        "android_view_RenderNode.cpp",

        "android_util_PathParser.cpp",



        "android/graphics/Bitmap.cpp",

        "android/graphics/BitmapFactory.cpp",

        "android/graphics/ByteBufferStreamAdaptor.cpp",

        "android/graphics/Camera.cpp",

        "android/graphics/CanvasProperty.cpp",

        "android/graphics/ColorFilter.cpp",

        "android/graphics/CreateJavaOutputStreamAdaptor.cpp",

        "android/graphics/FontFamily.cpp",

        "android/graphics/FontUtils.cpp",

        "android/graphics/Graphics.cpp",

        "android/graphics/ImageDecoder.cpp",

        "android/graphics/Interpolator.cpp",

        "android/graphics/MaskFilter.cpp",

        "android/graphics/Matrix.cpp",

        "android/graphics/NinePatch.cpp",

        "android/graphics/NinePatchPeeker.cpp",

        "android/graphics/Paint.cpp",

        "android/graphics/PaintFilter.cpp",

        "android/graphics/Path.cpp",

        "android/graphics/PathEffect.cpp",

        "android/graphics/PathMeasure.cpp",

        "android/graphics/Picture.cpp",

        "android/graphics/Region.cpp",

        "android/graphics/Shader.cpp",

        "android/graphics/Typeface.cpp",

        "android/graphics/Utils.cpp",

        "android/graphics/YuvToJpegEncoder.cpp",

        "android/graphics/fonts/Font.cpp",

        "android/graphics/fonts/FontFamily.cpp",

        "android/graphics/text/LineBreaker.cpp",

        "android/graphics/text/MeasuredText.cpp",

    ],



    local_include_dirs: [

        "include",  // NEEDED FOR ANDROID RUNTIME

        "android/graphics",

        "android/graphics/apex/include",

    ],



    export_include_dirs: [

        "android/graphics/apex/include",

    ],



    include_dirs: [

        "external/skia/include/private",

        "external/skia/src/codec",

        "external/skia/src/core",

        "external/skia/src/effects",

        "external/skia/src/image",

        "external/skia/src/images",

    ],



    shared_libs: [

        "libbase",

        "libcutils",

        "libharfbuzz_ng",

        "libhwui",

        "liblog",

        "libminikin",

        "libnativehelper",

        "libz",

        "libziparchive",

        "libjpeg",

    ],



    target: {

        android: {

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

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

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

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

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



                "android_view_TextureLayer.cpp",

                "android_view_ThreadedRenderer.cpp",

                "android/graphics/AnimatedImageDrawable.cpp",

                "android/graphics/BitmapRegionDecoder.cpp",

                "android/graphics/GIFMovie.cpp",

                "android/graphics/Movie.cpp",

                "android/graphics/MovieImpl.cpp",

                "android/graphics/pdf/PdfDocument.cpp",

                "android/graphics/pdf/PdfEditor.cpp",

                "android/graphics/pdf/PdfRenderer.cpp",

                "android/graphics/pdf/PdfUtils.cpp",

            ],

            shared_libs: [

                "libandroidfw",

                "libEGL",

                "libmediandk",

                "libnativedisplay",

                "libnativewindow",

                "libpdfium",

            ],

            static_libs: [

                "libgif",

            ],

        },

        host: {

            cflags: [

                "-Wno-unused-const-variable",

                "-Wno-unused-function",

            ],

            static_libs: [

                "libandroidfw",

            ],

        }

    },

}

core/jni/AndroidRuntime.cpp

+2 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ extern int register_android_content_StringBlock(JNIEnv* env); 
extern int register_android_content_XmlBlock(JNIEnv* env);

extern int register_android_content_res_ApkAssets(JNIEnv* env);

extern int register_android_graphics_BLASTBufferQueue(JNIEnv* env);

extern int register_android_graphics_SurfaceTexture(JNIEnv* env);

extern int register_android_view_DisplayEventReceiver(JNIEnv* env);

extern int register_android_view_InputApplicationHandle(JNIEnv* env);

extern int register_android_view_InputWindowHandle(JNIEnv* env);
@@ -1484,6 +1485,7 @@ static const RegJNIRec gRegJNI[] = { 
        REG_JNI(register_android_graphics_classes),

        REG_JNI(register_android_graphics_BLASTBufferQueue),

        REG_JNI(register_android_graphics_GraphicBuffer),

        REG_JNI(register_android_graphics_SurfaceTexture),

        REG_JNI(register_android_database_CursorWindow),

        REG_JNI(register_android_database_SQLiteConnection),

        REG_JNI(register_android_database_SQLiteGlobal),

core/jni/LayoutlibLoader.cpp

+0 −76
Original line number Diff line number Diff line
@@ -34,19 +34,6 @@ using namespace std; 


static JavaVM* javaVM;



extern int register_android_graphics_Bitmap(JNIEnv*);

extern int register_android_graphics_BitmapFactory(JNIEnv*);

extern int register_android_graphics_ByteBufferStreamAdaptor(JNIEnv* env);

extern int register_android_graphics_CreateJavaOutputStreamAdaptor(JNIEnv* env);

extern int register_android_graphics_Graphics(JNIEnv* env);

extern int register_android_graphics_ImageDecoder(JNIEnv*);

extern int register_android_graphics_Interpolator(JNIEnv* env);

extern int register_android_graphics_MaskFilter(JNIEnv* env);

extern int register_android_graphics_NinePatch(JNIEnv*);

extern int register_android_graphics_PathEffect(JNIEnv* env);

extern int register_android_graphics_Shader(JNIEnv* env);

extern int register_android_graphics_Typeface(JNIEnv* env);



namespace android {



extern int register_android_animation_PropertyValuesHolder(JNIEnv *env);
@@ -54,25 +41,6 @@ extern int register_android_content_AssetManager(JNIEnv* env); 
extern int register_android_content_StringBlock(JNIEnv* env);

extern int register_android_content_XmlBlock(JNIEnv* env);

extern int register_android_content_res_ApkAssets(JNIEnv* env);

extern int register_android_graphics_Canvas(JNIEnv* env);

extern int register_android_graphics_ColorFilter(JNIEnv* env);

extern int register_android_graphics_ColorSpace(JNIEnv* env);

extern int register_android_graphics_DrawFilter(JNIEnv* env);

extern int register_android_graphics_FontFamily(JNIEnv* env);

extern int register_android_graphics_Matrix(JNIEnv* env);

extern int register_android_graphics_Paint(JNIEnv* env);

extern int register_android_graphics_Path(JNIEnv* env);

extern int register_android_graphics_PathMeasure(JNIEnv* env);

extern int register_android_graphics_Picture(JNIEnv* env);

extern int register_android_graphics_Region(JNIEnv* env);

extern int register_android_graphics_animation_NativeInterpolatorFactory(JNIEnv* env);

extern int register_android_graphics_animation_RenderNodeAnimator(JNIEnv* env);

extern int register_android_graphics_drawable_AnimatedVectorDrawable(JNIEnv* env);

extern int register_android_graphics_drawable_VectorDrawable(JNIEnv* env);

extern int register_android_graphics_fonts_Font(JNIEnv* env);

extern int register_android_graphics_fonts_FontFamily(JNIEnv* env);

extern int register_android_graphics_text_LineBreaker(JNIEnv* env);

extern int register_android_graphics_text_MeasuredText(JNIEnv* env);

extern int register_android_os_FileObserver(JNIEnv* env);

extern int register_android_os_MessageQueue(JNIEnv* env);

extern int register_android_os_SystemClock(JNIEnv* env);
@@ -81,10 +49,7 @@ extern int register_android_os_Trace(JNIEnv* env); 
extern int register_android_text_AndroidCharacter(JNIEnv* env);

extern int register_android_util_EventLog(JNIEnv* env);

extern int register_android_util_Log(JNIEnv* env);

extern int register_android_util_PathParser(JNIEnv* env);

extern int register_android_util_jar_StrictJarFile(JNIEnv* env);

extern int register_android_view_RenderNode(JNIEnv* env);

extern int register_android_view_DisplayListCanvas(JNIEnv* env);

extern int register_com_android_internal_util_VirtualRefBasePtr(JNIEnv *env);



#define REG_JNI(name)      { name }
@@ -103,46 +68,6 @@ static const std::unordered_map<std::string, RegJNIRec> gRegJNIMap = { 
#endif

        {"android.content.res.StringBlock", REG_JNI(register_android_content_StringBlock)},

        {"android.content.res.XmlBlock", REG_JNI(register_android_content_XmlBlock)},

        {"android.graphics.Bitmap", REG_JNI(register_android_graphics_Bitmap)},

        {"android.graphics.BitmapFactory", REG_JNI(register_android_graphics_BitmapFactory)},

        {"android.graphics.ByteBufferStreamAdaptor",

         REG_JNI(register_android_graphics_ByteBufferStreamAdaptor)},

        {"android.graphics.Canvas", REG_JNI(register_android_graphics_Canvas)},

        {"android.graphics.RenderNode", REG_JNI(register_android_view_RenderNode)},

        {"android.graphics.ColorFilter", REG_JNI(register_android_graphics_ColorFilter)},

        {"android.graphics.ColorSpace", REG_JNI(register_android_graphics_ColorSpace)},

        {"android.graphics.CreateJavaOutputStreamAdaptor",

         REG_JNI(register_android_graphics_CreateJavaOutputStreamAdaptor)},

        {"android.graphics.DrawFilter", REG_JNI(register_android_graphics_DrawFilter)},

        {"android.graphics.FontFamily", REG_JNI(register_android_graphics_FontFamily)},

        {"android.graphics.Graphics", REG_JNI(register_android_graphics_Graphics)},

        {"android.graphics.ImageDecoder", REG_JNI(register_android_graphics_ImageDecoder)},

        {"android.graphics.Interpolator", REG_JNI(register_android_graphics_Interpolator)},

        {"android.graphics.MaskFilter", REG_JNI(register_android_graphics_MaskFilter)},

        {"android.graphics.Matrix", REG_JNI(register_android_graphics_Matrix)},

        {"android.graphics.NinePatch", REG_JNI(register_android_graphics_NinePatch)},

        {"android.graphics.Paint", REG_JNI(register_android_graphics_Paint)},

        {"android.graphics.Path", REG_JNI(register_android_graphics_Path)},

        {"android.graphics.PathEffect", REG_JNI(register_android_graphics_PathEffect)},

        {"android.graphics.PathMeasure", REG_JNI(register_android_graphics_PathMeasure)},

        {"android.graphics.Picture", REG_JNI(register_android_graphics_Picture)},

        {"android.graphics.RecordingCanvas", REG_JNI(register_android_view_DisplayListCanvas)},

        {"android.graphics.Region", REG_JNI(register_android_graphics_Region)},

        {"android.graphics.Shader", REG_JNI(register_android_graphics_Shader)},

        {"android.graphics.Typeface", REG_JNI(register_android_graphics_Typeface)},

        {"android.graphics.animation.NativeInterpolatorFactory",

         REG_JNI(register_android_graphics_animation_NativeInterpolatorFactory)},

        {"android.graphics.animation.RenderNodeAnimator",

         REG_JNI(register_android_graphics_animation_RenderNodeAnimator)},

        {"android.graphics.drawable.AnimatedVectorDrawable",

         REG_JNI(register_android_graphics_drawable_AnimatedVectorDrawable)},

        {"android.graphics.drawable.VectorDrawable",

         REG_JNI(register_android_graphics_drawable_VectorDrawable)},

        {"android.graphics.fonts.Font", REG_JNI(register_android_graphics_fonts_Font)},

        {"android.graphics.fonts.FontFamily", REG_JNI(register_android_graphics_fonts_FontFamily)},

        {"android.graphics.text.LineBreaker", REG_JNI(register_android_graphics_text_LineBreaker)},

        {"android.graphics.text.MeasuredText",

         REG_JNI(register_android_graphics_text_MeasuredText)},

#ifdef __linux__

        {"android.os.FileObserver", REG_JNI(register_android_os_FileObserver)},

        {"android.os.MessageQueue", REG_JNI(register_android_os_MessageQueue)},
@@ -153,7 +78,6 @@ static const std::unordered_map<std::string, RegJNIRec> gRegJNIMap = { 
        {"android.text.AndroidCharacter", REG_JNI(register_android_text_AndroidCharacter)},

        {"android.util.EventLog", REG_JNI(register_android_util_EventLog)},

        {"android.util.Log", REG_JNI(register_android_util_Log)},

        {"android.util.PathParser", REG_JNI(register_android_util_PathParser)},

        {"android.util.jar.StrictJarFile", REG_JNI(register_android_util_jar_StrictJarFile)},

        {"com.android.internal.util.VirtualRefBasePtr",

         REG_JNI(register_com_android_internal_util_VirtualRefBasePtr)},

core/jni/android_graphics_GraphicBuffer.cpp

+15 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <android/native_window.h>

#include <android/graphics/canvas.h>

#include <android_runtime/android_graphics_GraphicBuffer.h>

#include <android_runtime/android_hardware_HardwareBuffer.h>

#include <private/android/AHardwareBufferHelpers.h>



#include <private/gui/ComposerService.h>
@@ -260,6 +261,16 @@ jobject android_graphics_GraphicBuffer_createFromAHardwareBuffer(JNIEnv* env, 
    return obj;

}



// ----------------------------------------------------------------------------

// AHB to GraphicBuffer Converter

// ----------------------------------------------------------------------------



static jobject android_graphics_GraphicBuffer_createFromHardwareBuffer(JNIEnv* env, jobject clazz,

                                                                       jobject hb) {

    AHardwareBuffer* ahb = android_hardware_HardwareBuffer_getNativeHardwareBuffer(env, hb);

    return android_graphics_GraphicBuffer_createFromAHardwareBuffer(env, ahb);

}



};



using namespace android;
@@ -283,7 +294,10 @@ static const JNINativeMethod gMethods[] = { 
    { "nUnlockCanvasAndPost", "(JLandroid/graphics/Canvas;)Z",

            (void*) android_graphics_GraphicBuffer_unlockCanvasAndPost },

    { "nWrapGraphicBuffer", "(J)J",

            (void*) android_graphics_GraphicBuffer_wrap }

            (void*) android_graphics_GraphicBuffer_wrap },

    { "nCreateFromHardwareBuffer",

            "(Landroid/hardware/HardwareBuffer;)Landroid/graphics/GraphicBuffer;",

            (void*) android_graphics_GraphicBuffer_createFromHardwareBuffer }

};



int register_android_graphics_GraphicBuffer(JNIEnv* env) {

core/jni/android/graphics/SurfaceTexture.cpp→core/jni/android_graphics_SurfaceTexture.cpp

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 * limitations under the License.

 */



#undef LOG_TAG

#define LOG_TAG "SurfaceTexture"



#include <stdio.h>