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

Commit 182cbf9d authored by Fedor Kudasov's avatar Fedor Kudasov
Browse files

Merge libhwui and libhwui-host targets 

Bug: 117921091
Test: all tests should pass
Change-Id: I6d5c3b6af2a2837e5f3e729b165116e2860859ab
parent 539f31e4

core/jni/Android.bp

+2 −5
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ cc_library_shared { 
        "libbase",

        "libcutils",

        "libharfbuzz_ng",

        "libhwui",

        "liblog",

        "libminikin",

        "libnativehelper",
@@ -315,7 +316,6 @@ cc_library_shared { 
                "libhwbinder",

                "libvintf",

                "libnativewindow",

                "libhwui",

                "libdl",

                "libdl_android",

                "libstatslog",
@@ -344,9 +344,6 @@ cc_library_shared { 
            include_dirs: [

                "external/vulkan-headers/include",

            ],

            shared_libs: [

                "libhwui-host",

            ],

            static_libs: [

                "libandroidfw",

                "libcompiler_rt",

libs/hwui/Android.bp

+128 −142
Original line number Diff line number Diff line
@@ -33,11 +33,6 @@ cc_defaults { 
    include_dirs: [

        "external/skia/include/private",

        "external/skia/src/core",

        "external/skia/src/effects",

        "external/skia/src/image",

        "external/skia/src/utils",

        "external/skia/src/gpu",

        "external/skia/src/shaders",

    ],



    product_variables: {
@@ -47,14 +42,41 @@ cc_defaults { 
            },

        },

    },



    target: {

        android: {

            include_dirs: [

                "external/skia/src/effects",

                "external/skia/src/image",

                "external/skia/src/utils",

                "external/skia/src/gpu",

                "external/skia/src/shaders",

            ],

        },

        host: {

            include_dirs: [

                "external/vulkan-headers/include",

            ],

            cflags: [

                "-Wno-unused-variable",

            ],

        }

    }

}



cc_defaults {

    name: "hwui_static_deps",

    shared_libs: [

        "libbase",

        "libharfbuzz_ng",

        "libminikin",

    ],



    target: {

        android: {

            shared_libs: [

                "liblog",

                "libcutils",

        "libbase",

                "libstatslog",

                "libutils",

                "libEGL",
@@ -65,9 +87,7 @@ cc_defaults { 
                "libui",

                "libgui",

                "libprotobuf-cpp-lite",

        "libharfbuzz_ng",

                "libft2",

        "libminikin",

                "libandroidfw",

                "libcrypto",

                "libsync",
@@ -75,6 +95,14 @@ cc_defaults { 
            static_libs: [

                "libEGL_blobCache",

            ],

        },

        host: {

            static_libs: [

                "libandroidfw",

                "libutils",

            ],

        }

    }

}



cc_defaults {
@@ -139,6 +167,30 @@ cc_defaults { 
        "hwui/MinikinUtils.cpp",

        "hwui/PaintImpl.cpp",

        "hwui/Typeface.cpp",

        "utils/Blur.cpp",

        "utils/LinearAllocator.cpp",

        "utils/VectorDrawableUtils.cpp",

        "Animator.cpp",

        "Interpolator.cpp",

        "Matrix.cpp",

        "PathParser.cpp",

        "Properties.cpp",

        "PropertyValuesAnimatorSet.cpp",

        "PropertyValuesHolder.cpp",

        "SkiaCanvas.cpp",

        "VectorDrawable.cpp",

    ],



    proto: {

        export_proto_headers: true,

    },



    export_include_dirs: ["."],



    target: {

        android: {



            srcs: [

                "pipeline/skia/GLFunctorDrawable.cpp",

                "pipeline/skia/LayerDrawable.cpp",

                "pipeline/skia/RenderNodeDrawable.cpp",
@@ -172,14 +224,10 @@ cc_defaults { 
                "surfacetexture/ImageConsumer.cpp",

                "surfacetexture/SurfaceTexture.cpp",

                "thread/CommonPool.cpp",

        "utils/Blur.cpp",

                "utils/Color.cpp",

                "utils/GLUtils.cpp",

        "utils/LinearAllocator.cpp",

                "utils/StringUtils.cpp",

        "utils/VectorDrawableUtils.cpp",

                "AnimationContext.cpp",

        "Animator.cpp",

                "AnimatorManager.cpp",

                "CanvasTransform.cpp",

                "DamageAccumulator.cpp",
@@ -190,40 +238,34 @@ cc_defaults { 
                "GpuMemoryTracker.cpp",

                "HardwareBitmapUploader.cpp",

                "HWUIProperties.sysprop",

        "Interpolator.cpp",

                "JankTracker.cpp",

                "Layer.cpp",

                "LayerUpdateQueue.cpp",

        "Matrix.cpp",

        "PathParser.cpp",

                "ProfileData.cpp",

                "ProfileDataContainer.cpp",

        "Properties.cpp",

        "PropertyValuesAnimatorSet.cpp",

        "PropertyValuesHolder.cpp",

                "Readback.cpp",

                "RecordingCanvas.cpp",

                "RenderNode.cpp",

                "RenderProperties.cpp",

        "SkiaCanvas.cpp",

                "TreeInfo.cpp",

                "WebViewFunctorManager.cpp",

        "VectorDrawable.cpp",

                "protos/graphicsstats.proto",

            ],



            // Allow implicit fallthroughs in HardwareBitmapUploader.cpp until they are fixed.

            cflags: ["-Wno-implicit-fallthrough"],



    proto: {

        export_proto_headers: true,

        },



    export_include_dirs: ["."],

        host: {

            export_static_lib_headers: [

                "libarect",

            ],

        }

    }

}



cc_library {

    name: "libhwui",

    host_supported: true,

    defaults: [

        "libhwui_defaults",

    ],
@@ -352,59 +394,3 @@ phony { 
        "hwuimacro",

    ]

}
 


cc_library_host_shared {

    name: "libhwui-host",



    defaults: [

        "skia_deps",

    ],

    whole_static_libs: ["libskia"],



    srcs: [

        "hwui/AnimatedImageDrawable.cpp",

        "hwui/AnimatedImageThread.cpp",

        "hwui/Bitmap.cpp",

        "hwui/Canvas.cpp",

        "hwui/Typeface.cpp",

        "hwui/MinikinSkia.cpp",

        "hwui/MinikinUtils.cpp",

        "hwui/PaintImpl.cpp",

        "utils/Blur.cpp",

        "utils/LinearAllocator.cpp",

        "utils/VectorDrawableUtils.cpp",

        "Animator.cpp",

        "Interpolator.cpp",

        "Matrix.cpp",

        "PathParser.cpp",

        "Properties.cpp",

        "PropertyValuesAnimatorSet.cpp",

        "PropertyValuesHolder.cpp",

        "SkiaCanvas.cpp",

        "VectorDrawable.cpp",

    ],

    include_dirs: [

        "external/skia/include/private",

        "external/skia/src/core",

        "external/vulkan-headers/include",

        "system/core/base/include",

    ],

    cpp_std: "experimental",

    cflags: [

        "-Wno-unused-parameter",

        "-Wno-unused-variable",

    ],

    shared_libs: [

        "libbase",

        "libharfbuzz_ng",

        "libminikin",

    ],

    static_libs: [

        "libandroidfw",

        "libutils",

    ],

    export_include_dirs: ["."],

    export_static_lib_headers: [

        "libarect",

    ],

}