diff options
Diffstat (limited to 'libs/hwui/Android.bp')
| -rw-r--r-- | libs/hwui/Android.bp | 92 |
1 files changed, 14 insertions, 78 deletions
diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp index fb8274426b16..17d2db71ab58 100644 --- a/libs/hwui/Android.bp +++ b/libs/hwui/Android.bp @@ -61,6 +61,7 @@ cc_defaults { shared_libs: [ "liblog", "libcutils", + "libstatslog", "libutils", "libEGL", "libGLESv2", @@ -72,7 +73,7 @@ cc_defaults { "libft2", "libminikin", "libandroidfw", - "libRScpp", + "libcrypto", ], static_libs: [ "libEGL_blobCache", @@ -81,7 +82,6 @@ cc_defaults { cc_defaults { name: "hwui_bugreport_font_cache_usage", - srcs: ["font/FontCacheHistoryTracker.cpp"], cflags: ["-DBUGREPORT_FONT_CACHE_USAGE"], } @@ -158,8 +158,6 @@ cc_defaults { "hwui/AnimatedImageDrawable.cpp", "hwui/AnimatedImageThread.cpp", "hwui/Bitmap.cpp", - "font/CacheTexture.cpp", - "font/Font.cpp", "hwui/Canvas.cpp", "hwui/MinikinSkia.cpp", "hwui/MinikinUtils.cpp", @@ -173,23 +171,15 @@ cc_defaults { "pipeline/skia/SkiaDisplayList.cpp", "pipeline/skia/SkiaMemoryTracer.cpp", "pipeline/skia/SkiaOpenGLPipeline.cpp", - "pipeline/skia/SkiaOpenGLReadback.cpp", "pipeline/skia/SkiaPipeline.cpp", "pipeline/skia/SkiaProfileRenderer.cpp", "pipeline/skia/SkiaRecordingCanvas.cpp", "pipeline/skia/SkiaVulkanPipeline.cpp", "pipeline/skia/VectorDrawableAtlas.cpp", - "renderstate/Blend.cpp", - "renderstate/MeshState.cpp", - "renderstate/OffscreenBufferPool.cpp", - "renderstate/PixelBufferState.cpp", + "pipeline/skia/VkInteropFunctorDrawable.cpp", "renderstate/RenderState.cpp", - "renderstate/Scissor.cpp", - "renderstate/Stencil.cpp", - "renderstate/TextureState.cpp", "renderthread/CacheManager.cpp", "renderthread/CanvasContext.cpp", - "renderthread/OpenGLPipeline.cpp", "renderthread/DrawFrameTask.cpp", "renderthread/EglManager.cpp", "renderthread/VulkanManager.cpp", @@ -199,89 +189,56 @@ cc_defaults { "renderthread/TimeLord.cpp", "renderthread/Frame.cpp", "service/GraphicsStatsService.cpp", + "surfacetexture/EGLConsumer.cpp", + "surfacetexture/ImageConsumer.cpp", + "surfacetexture/SurfaceTexture.cpp", "thread/TaskManager.cpp", "utils/Blur.cpp", "utils/Color.cpp", "utils/GLUtils.cpp", "utils/LinearAllocator.cpp", "utils/StringUtils.cpp", - "utils/TestWindowContext.cpp", "utils/VectorDrawableUtils.cpp", - "AmbientShadow.cpp", "AnimationContext.cpp", "Animator.cpp", "AnimatorManager.cpp", - "BakedOpDispatcher.cpp", - "BakedOpRenderer.cpp", - "BakedOpState.cpp", - "Caches.cpp", - "CanvasState.cpp", - "ClipArea.cpp", + "CanvasTransform.cpp", "DamageAccumulator.cpp", "DeferredLayerUpdater.cpp", "DeviceInfo.cpp", - "DisplayList.cpp", - "Extensions.cpp", - "FboCache.cpp", - "FontRenderer.cpp", - "FrameBuilder.cpp", "FrameInfo.cpp", "FrameInfoVisualizer.cpp", - "GammaFontRenderer.cpp", - "GlLayer.cpp", - "GlopBuilder.cpp", "GpuMemoryTracker.cpp", - "GradientCache.cpp", - "Image.cpp", + "HardwareBitmapUploader.cpp", "Interpolator.cpp", "JankTracker.cpp", "Layer.cpp", - "LayerBuilder.cpp", "LayerUpdateQueue.cpp", "Matrix.cpp", - "OpDumper.cpp", - "OpenGLReadback.cpp", - "Patch.cpp", - "PatchCache.cpp", - "PathCache.cpp", "PathParser.cpp", - "PathTessellator.cpp", - "PixelBuffer.cpp", "ProfileData.cpp", "ProfileDataContainer.cpp", - "ProfileRenderer.cpp", - "Program.cpp", - "ProgramCache.cpp", "Properties.cpp", "PropertyValuesAnimatorSet.cpp", "PropertyValuesHolder.cpp", + "Readback.cpp", "RecordingCanvas.cpp", - "RenderBufferCache.cpp", "RenderNode.cpp", "RenderProperties.cpp", - "ResourceCache.cpp", - "ShadowTessellator.cpp", "SkiaCanvas.cpp", - "SkiaCanvasProxy.cpp", - "SkiaShader.cpp", - "Snapshot.cpp", - "SpotShadow.cpp", - "TessellationCache.cpp", - "TextDropShadowCache.cpp", - "Texture.cpp", - "TextureCache.cpp", + "TreeInfo.cpp", "VectorDrawable.cpp", - "VkLayer.cpp", "protos/graphicsstats.proto", - "protos/hwui.proto", ], + // Allow implicit fallthroughs in HardwareBitmapUploader.cpp until they are fixed. + cflags: ["-Wno-implicit-fallthrough"], + proto: { export_proto_headers: true, }, export_include_dirs: ["."], - export_shared_lib_headers: ["libRScpp"], } cc_library { @@ -292,7 +249,7 @@ cc_library { // Enables fine-grained GLES error checking // If enabled, every GLES call is wrapped & error checked // Has moderate overhead - "hwui_enable_opengl_validation", + //"hwui_enable_opengl_validation", ], } @@ -348,33 +305,18 @@ cc_test { srcs: [ "tests/unit/main.cpp", - "tests/unit/BakedOpDispatcherTests.cpp", - "tests/unit/BakedOpRendererTests.cpp", - "tests/unit/BakedOpStateTests.cpp", "tests/unit/CacheManagerTests.cpp", "tests/unit/CanvasContextTests.cpp", - "tests/unit/CanvasStateTests.cpp", - "tests/unit/ClipAreaTests.cpp", "tests/unit/DamageAccumulatorTests.cpp", "tests/unit/DeferredLayerUpdaterTests.cpp", - "tests/unit/DeviceInfoTests.cpp", "tests/unit/FatVectorTests.cpp", - "tests/unit/FontRendererTests.cpp", - "tests/unit/FrameBuilderTests.cpp", - "tests/unit/GlopBuilderTests.cpp", "tests/unit/GpuMemoryTrackerTests.cpp", - "tests/unit/GradientCacheTests.cpp", "tests/unit/GraphicsStatsServiceTests.cpp", "tests/unit/LayerUpdateQueueTests.cpp", - "tests/unit/LeakCheckTests.cpp", "tests/unit/LinearAllocatorTests.cpp", "tests/unit/MatrixTests.cpp", - "tests/unit/MeshStateTests.cpp", - "tests/unit/OffscreenBufferPoolTests.cpp", - "tests/unit/OpDumperTests.cpp", "tests/unit/PathInterpolatorTests.cpp", "tests/unit/RenderNodeDrawableTests.cpp", - "tests/unit/RecordingCanvasTests.cpp", "tests/unit/RenderNodeTests.cpp", "tests/unit/RenderPropertiesTests.cpp", "tests/unit/ShaderCacheTests.cpp", @@ -383,11 +325,8 @@ cc_test { "tests/unit/SkiaPipelineTests.cpp", "tests/unit/SkiaRenderPropertiesTests.cpp", "tests/unit/SkiaCanvasTests.cpp", - "tests/unit/SnapshotTests.cpp", "tests/unit/StringUtilsTests.cpp", "tests/unit/TestUtilsTests.cpp", - "tests/unit/TextDropShadowCacheTests.cpp", - "tests/unit/TextureCacheTests.cpp", "tests/unit/ThreadBaseTests.cpp", "tests/unit/TypefaceTests.cpp", "tests/unit/VectorDrawableTests.cpp", @@ -436,12 +375,9 @@ cc_benchmark { srcs: [ "tests/microbench/main.cpp", "tests/microbench/DisplayListCanvasBench.cpp", - "tests/microbench/FontBench.cpp", - "tests/microbench/FrameBuilderBench.cpp", "tests/microbench/LinearAllocatorBench.cpp", "tests/microbench/PathParserBench.cpp", "tests/microbench/RenderNodeBench.cpp", - "tests/microbench/ShadowBench.cpp", "tests/microbench/TaskManagerBench.cpp", ], } |