Revert "Create a new RenderPipeline for CPU only rendering"
This reverts commit 09a38e4e8c64ccf62573da7ffbe40cef90e573ae.
Reason for revert: b/331231487
Change-Id: If9529d7ba39edef707af50f67ca8cd4754bfe11b
diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp
index a443dc9..014b841 100644
--- a/libs/hwui/Android.bp
+++ b/libs/hwui/Android.bp
@@ -78,13 +78,13 @@
include_dirs: [
"external/skia/include/private",
"external/skia/src/core",
- "external/skia/src/utils",
],
target: {
android: {
include_dirs: [
"external/skia/src/image",
+ "external/skia/src/utils",
"external/skia/src/gpu",
"external/skia/src/shaders",
],
@@ -529,9 +529,7 @@
"effects/GainmapRenderer.cpp",
"pipeline/skia/BackdropFilterDrawable.cpp",
"pipeline/skia/HolePunch.cpp",
- "pipeline/skia/SkiaCpuPipeline.cpp",
"pipeline/skia/SkiaDisplayList.cpp",
- "pipeline/skia/SkiaPipeline.cpp",
"pipeline/skia/SkiaRecordingCanvas.cpp",
"pipeline/skia/StretchMask.cpp",
"pipeline/skia/RenderNodeDrawable.cpp",
@@ -569,7 +567,6 @@
"HWUIProperties.sysprop",
"Interpolator.cpp",
"JankTracker.cpp",
- "LayerUpdateQueue.cpp",
"LightingInfo.cpp",
"Matrix.cpp",
"Mesh.cpp",
@@ -607,9 +604,9 @@
"pipeline/skia/GLFunctorDrawable.cpp",
"pipeline/skia/LayerDrawable.cpp",
"pipeline/skia/ShaderCache.cpp",
- "pipeline/skia/SkiaGpuPipeline.cpp",
"pipeline/skia/SkiaMemoryTracer.cpp",
"pipeline/skia/SkiaOpenGLPipeline.cpp",
+ "pipeline/skia/SkiaPipeline.cpp",
"pipeline/skia/SkiaProfileRenderer.cpp",
"pipeline/skia/SkiaVulkanPipeline.cpp",
"pipeline/skia/VkFunctorDrawable.cpp",
@@ -633,6 +630,7 @@
"DeferredLayerUpdater.cpp",
"HardwareBitmapUploader.cpp",
"Layer.cpp",
+ "LayerUpdateQueue.cpp",
"ProfileDataContainer.cpp",
"Readback.cpp",
"TreeInfo.cpp",