Move CompositionPlanner from backend/ to compositor/

Change-Id: Iebd4a4d0e15c5171aa20fafe3686b7bc8c08a175

Android.bp

@@ -74,8 +74,10 @@ filegroup {
         "bufferinfo/BufferInfoGetter.cpp",
         "bufferinfo/BufferInfoMapperMetadata.cpp",
 
+        "compositor/CompositionPlanner.cpp",
         "compositor/DrmKmsPlan.cpp",
         "compositor/FlatteningController.cpp",
+        "compositor/GenericCompositionPlanner.cpp",
 
         "drm/DrmAtomicStateManager.cpp",
         "drm/DrmConnector.cpp",
@@ -94,9 +96,7 @@ filegroup {
 
         "backend/BackendManager.cpp",
         "backend/ClientBackend.cpp",
-        "backend/CompositionPlanner.cpp",
         "backend/GenericBackend.cpp",
-        "backend/GenericCompositionPlanner.cpp",
 
         "hwc/HwcDisplay.cpp",
         "hwc/HwcDisplayConfigs.cpp",

backend/BackendManager.h

@@ -21,7 +21,7 @@
 #include <string>
 #include <vector>
 
-#include "CompositionPlanner.h"
+#include "compositor/CompositionPlanner.h"
 
 namespace android::drm_hwcomposer {
 

backend/ClientBackend.cpp

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "GenericBackend.h"
-#include "GenericCompositionPlanner.h"
+#include "backend/GenericBackend.h"
+#include "compositor/GenericCompositionPlanner.h"
 #include "hwc/HwcDisplay.h"
 
 namespace android::drm_hwcomposer {

backend/GenericBackend.cpp

@@ -16,7 +16,7 @@
 
 #include "backend/GenericBackend.h"
 
-#include "backend/GenericCompositionPlanner.h"
+#include "compositor/GenericCompositionPlanner.h"
 #include "drm/DrmDisplayPipeline.h"
 
 namespace android::drm_hwcomposer {

backend/GenericBackend.h

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "backend/BackendManager.h"
-#include "backend/CompositionPlanner.h"
+#include "compositor/CompositionPlanner.h"
 
 namespace android::drm_hwcomposer {
 

compositor/CompositionPlanner.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "backend/CompositionPlanner.h"
+#include "CompositionPlanner.h"
 
 #include "hwc/HwcLayer.h"
 

compositor/GenericCompositionPlanner.cpp

@@ -20,7 +20,7 @@
 #include <tuple>
 #include <vector>
 
-#include "BackendManager.h"
+#include "backend/BackendManager.h"
 #include "compositor/FlatteningController.h"
 #include "compositor/LayerData.h"
 #include "hwc/HwcDisplay.h"

drm/DrmDisplayPipeline.cpp

@@ -24,7 +24,7 @@
 #include "DrmDevice.h"
 #include "DrmEncoder.h"
 #include "DrmPlane.h"
-#include "backend/CompositionPlanner.h"
+#include "compositor/CompositionPlanner.h"
 #include "utils/log.h"
 #include "utils/properties.h"
 

hwc/HwcDisplay.cpp

@@ -27,7 +27,7 @@
 #include <ui/GraphicTypes.h>
 #include <utils/Trace.h>
 
-#include "backend/CompositionPlanner.h"
+#include "compositor/CompositionPlanner.h"
 #include "compositor/DisplayInfo.h"
 #include "compositor/FlatteningController.h"
 #include "drm/DrmConnector.h"

hwc/HwcDisplay.h

@@ -20,7 +20,7 @@
 
 #include "HwcDisplayConfigs.h"
 #include "HwcLayer.h"
-#include "backend/CompositionPlanner.h"
+#include "compositor/CompositionPlanner.h"
 #include "compositor/DisplayInfo.h"
 #include "compositor/LayerData.h"
 #include "drm/DrmAtomicStateManager.h"

hwc2_device/DrmHwcTwo.cpp

@@ -20,7 +20,7 @@
 
 #include <cinttypes>
 
-#include "backend/CompositionPlanner.h"
+#include "compositor/CompositionPlanner.h"
 #include "utils/log.h"
 
 namespace android::drm_hwcomposer {

hwc2_device/hwc2_device.cpp

@@ -28,7 +28,7 @@
 #include <ui/GraphicTypes.h>
 
 #include "DrmHwcTwo.h"
-#include "backend/CompositionPlanner.h"
+#include "compositor/CompositionPlanner.h"
 #include "compositor/DisplayInfo.h"
 #include "hardware/hwcomposer2.h"
 #include "hwc/HwcLayer.h"

meson.build

@@ -10,14 +10,14 @@ project(
 inc_include = [include_directories('.')]
 
 src_common = files(
+    'backend/BackendManager.cpp',
+    'backend/ClientBackend.cpp',
+    'backend/GenericBackend.cpp',
+    'compositor/CompositionPlanner.cpp',
     'compositor/DrmKmsPlan.cpp',
     'compositor/FlatteningController.cpp',
     'compositor/FlatteningEventAtomReporter.cpp',
-    'backend/BackendManager.cpp',
-    'backend/GenericCompositionPlanner.cpp',
-    'backend/ClientBackend.cpp',
-    'backend/CompositionPlanner.cpp',
-    'backend/GenericBackend.cpp',
+    'compositor/GenericCompositionPlanner.cpp',
     'hwc/HwcDisplayConfigs.cpp',
     'hwc/HwcDisplay.cpp',
     'hwc/HwcLayer.cpp',

stats/CompositionStats.h

@@ -20,7 +20,7 @@
 #include <functional>
 #include <map>
 
-#include "backend/CompositionPlanner.h"
+#include "compositor/CompositionPlanner.h"
 
 namespace android::drm_hwcomposer {
 

stats/CompositionStatsAtomReporter.h

@@ -19,7 +19,7 @@
 #include <memory>
 
 #include "CompositionStats.h"
-#include "backend/CompositionPlanner.h"
+#include "compositor/CompositionPlanner.h"
 
 namespace android::drm_hwcomposer {
 

stats/CompositionStatsAtomReporterDesktop.cpp

@@ -26,7 +26,7 @@
 #include <android/binder_manager.h>
 
 #include "CompositionStats.h"
-#include "backend/CompositionPlanner.h"
+#include "compositor/CompositionPlanner.h"
 #include "desktopatoms.h"
 #include "utils/log.h"