drm_hwcomposer: Organize files into subdirs

This is way overdue

Signed-off-by: Sean Paul <seanpaul@chromium.org>

Change-Id: I1bcbd8fdb0bb03feafd76bc41f6f11c03cdf9c25

46 files changed, 32 insertions, 24 deletions

diff --git a/Android.bp b/Android.bp
index cd28e41..5681cb7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,7 +18,9 @@
 cc_library_static {
     name: "libdrmhwc_utils",
 
-    srcs: ["worker.cpp"],
+    srcs: ["utils/worker.cpp"],
+
+    include_dirs: ["external/drm_hwcomposer/include"],
 
     cflags: [
         "-Wall",
@@ -45,6 +47,8 @@ cc_defaults {
         "libutils",
     ],
 
+    include_dirs: ["external/drm_hwcomposer/include"],
+
     static_libs: ["libdrmhwc_utils"],
 
     cflags: [
@@ -64,22 +68,26 @@ cc_library_static {
     name: "drm_hwcomposer",
     defaults: ["hwcomposer.drm_defaults"],
     srcs: [
-        "autolock.cpp",
-        "resourcemanager.cpp",
-        "drmdevice.cpp",
-        "drmconnector.cpp",
-        "drmcrtc.cpp",
-        "drmdisplaycomposition.cpp",
-        "drmdisplaycompositor.cpp",
-        "drmencoder.cpp",
-        "drmeventlistener.cpp",
         "drmhwctwo.cpp",
-        "drmmode.cpp",
-        "drmplane.cpp",
-        "drmproperty.cpp",
-        "hwcutils.cpp",
-        "platform.cpp",
-        "vsyncworker.cpp",
+
+        "compositor/drmdisplaycomposition.cpp",
+        "compositor/drmdisplaycompositor.cpp",
+
+        "drm/drmconnector.cpp",
+        "drm/drmcrtc.cpp",
+        "drm/drmdevice.cpp",
+        "drm/drmencoder.cpp",
+        "drm/drmeventlistener.cpp",
+        "drm/drmmode.cpp",
+        "drm/drmplane.cpp",
+        "drm/drmproperty.cpp",
+        "drm/resourcemanager.cpp",
+        "drm/vsyncworker.cpp",
+
+        "platform/platform.cpp",
+
+        "utils/autolock.cpp",
+        "utils/hwcutils.cpp",
     ],
 }
 
@@ -87,7 +95,7 @@ cc_library_shared {
     name: "hwcomposer.drm",
     defaults: ["hwcomposer.drm_defaults"],
     whole_static_libs: ["drm_hwcomposer"],
-    srcs: ["platformdrmgeneric.cpp"],
+    srcs: ["platform/platformdrmgeneric.cpp"],
     cppflags: ["-DUSE_DRM_GENERIC_IMPORTER"],
 }
 
@@ -96,8 +104,8 @@ cc_library_shared {
     defaults: ["hwcomposer.drm_defaults"],
     whole_static_libs: ["drm_hwcomposer"],
     srcs: [
-        "platformdrmgeneric.cpp",
-        "platformminigbm.cpp",
+        "platform/platformdrmgeneric.cpp",
+        "platform/platformminigbm.cpp",
     ],
     include_dirs: ["external/minigbm/cros_gralloc"],
 }
@@ -106,8 +114,8 @@ cc_library_shared {
 filegroup {
     name: "drm_hwcomposer_platformhisi",
     srcs: [
-        "platformdrmgeneric.cpp",
-        "platformhisi.cpp",
+        "platform/platformdrmgeneric.cpp",
+        "platform/platformhisi.cpp",
     ],
 }
 
@@ -115,7 +123,7 @@ filegroup {
 filegroup {
     name: "drm_hwcomposer_platformmeson",
     srcs: [
-        "platformdrmgeneric.cpp",
-        "platformmeson.cpp",
+        "platform/platformdrmgeneric.cpp",
+        "platform/platformmeson.cpp",
     ],
 }
diff --git a/drmdisplaycomposition.cpp b/compositor/drmdisplaycomposition.cpp
index b710fe1..b710fe1 100644
--- a/drmdisplaycomposition.cpp
+++ b/compositor/drmdisplaycomposition.cpp
diff --git a/drmdisplaycompositor.cpp b/compositor/drmdisplaycompositor.cpp
index e6f6922..e6f6922 100644
--- a/drmdisplaycompositor.cpp
+++ b/compositor/drmdisplaycompositor.cpp
diff --git a/drmconnector.cpp b/drm/drmconnector.cpp
index ead9312..ead9312 100644
--- a/drmconnector.cpp
+++ b/drm/drmconnector.cpp
diff --git a/drmcrtc.cpp b/drm/drmcrtc.cpp
index b627291..b627291 100644
--- a/drmcrtc.cpp
+++ b/drm/drmcrtc.cpp
diff --git a/drmdevice.cpp b/drm/drmdevice.cpp
index 2007fdd..2007fdd 100644
--- a/drmdevice.cpp
+++ b/drm/drmdevice.cpp
diff --git a/drmencoder.cpp b/drm/drmencoder.cpp
index c36fca1..c36fca1 100644
--- a/drmencoder.cpp
+++ b/drm/drmencoder.cpp
diff --git a/drmeventlistener.cpp b/drm/drmeventlistener.cpp
index 8f655a7..8f655a7 100644
--- a/drmeventlistener.cpp
+++ b/drm/drmeventlistener.cpp
diff --git a/drmmode.cpp b/drm/drmmode.cpp
index c3ab385..c3ab385 100644
--- a/drmmode.cpp
+++ b/drm/drmmode.cpp
diff --git a/drmplane.cpp b/drm/drmplane.cpp
index 6f1bf9b..6f1bf9b 100644
--- a/drmplane.cpp
+++ b/drm/drmplane.cpp
diff --git a/drmproperty.cpp b/drm/drmproperty.cpp
index 3aeed13..3aeed13 100644
--- a/drmproperty.cpp
+++ b/drm/drmproperty.cpp
diff --git a/resourcemanager.cpp b/drm/resourcemanager.cpp
index 6e23561..6e23561 100644
--- a/resourcemanager.cpp
+++ b/drm/resourcemanager.cpp
diff --git a/vsyncworker.cpp b/drm/vsyncworker.cpp
index d022887..d022887 100644
--- a/vsyncworker.cpp
+++ b/drm/vsyncworker.cpp
diff --git a/autofd.h b/include/autofd.h
index 9af6c22..9af6c22 100644
--- a/autofd.h
+++ b/include/autofd.h
diff --git a/autolock.h b/include/autolock.h
index 006406a..006406a 100644
--- a/autolock.h
+++ b/include/autolock.h
diff --git a/drmconnector.h b/include/drmconnector.h
index 9c526c8..9c526c8 100644
--- a/drmconnector.h
+++ b/include/drmconnector.h
diff --git a/drmcrtc.h b/include/drmcrtc.h
index 3075f9b..3075f9b 100644
--- a/drmcrtc.h
+++ b/include/drmcrtc.h
diff --git a/drmdevice.h b/include/drmdevice.h
index 91dd38b..91dd38b 100644
--- a/drmdevice.h
+++ b/include/drmdevice.h
diff --git a/drmdisplaycomposition.h b/include/drmdisplaycomposition.h
index 2a5b1a4..2a5b1a4 100644
--- a/drmdisplaycomposition.h
+++ b/include/drmdisplaycomposition.h
diff --git a/drmdisplaycompositor.h b/include/drmdisplaycompositor.h
index 1005598..1005598 100644
--- a/drmdisplaycompositor.h
+++ b/include/drmdisplaycompositor.h
diff --git a/drmencoder.h b/include/drmencoder.h
index 8a7f682..8a7f682 100644
--- a/drmencoder.h
+++ b/include/drmencoder.h
diff --git a/drmeventlistener.h b/include/drmeventlistener.h
index 95672ee..95672ee 100644
--- a/drmeventlistener.h
+++ b/include/drmeventlistener.h
diff --git a/drmframebuffer.h b/include/drmframebuffer.h
index 9032d3a..9032d3a 100644
--- a/drmframebuffer.h
+++ b/include/drmframebuffer.h
diff --git a/drmhwcgralloc.h b/include/drmhwcgralloc.h
index 65a4007..65a4007 100644
--- a/drmhwcgralloc.h
+++ b/include/drmhwcgralloc.h
diff --git a/drmhwcomposer.h b/include/drmhwcomposer.h
index 2af7e6e..2af7e6e 100644
--- a/drmhwcomposer.h
+++ b/include/drmhwcomposer.h
diff --git a/drmhwctwo.h b/include/drmhwctwo.h
index a71d7cc..a71d7cc 100644
--- a/drmhwctwo.h
+++ b/include/drmhwctwo.h
diff --git a/drmmode.h b/include/drmmode.h
index 4cc06b1..4cc06b1 100644
--- a/drmmode.h
+++ b/include/drmmode.h
diff --git a/drmplane.h b/include/drmplane.h
index 43e0e8a..43e0e8a 100644
--- a/drmplane.h
+++ b/include/drmplane.h
diff --git a/drmproperty.h b/include/drmproperty.h
index 2d92ca1..2d92ca1 100644
--- a/drmproperty.h
+++ b/include/drmproperty.h
diff --git a/platform.h b/include/platform.h
index 6fdece2..6fdece2 100644
--- a/platform.h
+++ b/include/platform.h
diff --git a/resourcemanager.h b/include/resourcemanager.h
index f10af45..f10af45 100644
--- a/resourcemanager.h
+++ b/include/resourcemanager.h
diff --git a/vsyncworker.h b/include/vsyncworker.h
index b2bca9d..b2bca9d 100644
--- a/vsyncworker.h
+++ b/include/vsyncworker.h
diff --git a/worker.h b/include/worker.h
index 7909038..7909038 100644
--- a/worker.h
+++ b/include/worker.h
diff --git a/platform.cpp b/platform/platform.cpp
index b7a47c7..b7a47c7 100644
--- a/platform.cpp
+++ b/platform/platform.cpp
diff --git a/platformdrmgeneric.cpp b/platform/platformdrmgeneric.cpp
index 2fcbe40..2fcbe40 100644
--- a/platformdrmgeneric.cpp
+++ b/platform/platformdrmgeneric.cpp
diff --git a/platformdrmgeneric.h b/platform/platformdrmgeneric.h
index c6d2be6..c6d2be6 100644
--- a/platformdrmgeneric.h
+++ b/platform/platformdrmgeneric.h
diff --git a/platformhisi.cpp b/platform/platformhisi.cpp
index 64b410b..64b410b 100644
--- a/platformhisi.cpp
+++ b/platform/platformhisi.cpp
diff --git a/platformhisi.h b/platform/platformhisi.h
index 9dfea89..9dfea89 100644
--- a/platformhisi.h
+++ b/platform/platformhisi.h
diff --git a/platformmeson.cpp b/platform/platformmeson.cpp
index 58ec5c0..58ec5c0 100644
--- a/platformmeson.cpp
+++ b/platform/platformmeson.cpp
diff --git a/platformmeson.h b/platform/platformmeson.h
index 7be7702..7be7702 100644
--- a/platformmeson.h
+++ b/platform/platformmeson.h
diff --git a/platformminigbm.cpp b/platform/platformminigbm.cpp
index ad0a373..ad0a373 100644
--- a/platformminigbm.cpp
+++ b/platform/platformminigbm.cpp
diff --git a/platformminigbm.h b/platform/platformminigbm.h
index ff69f14..ff69f14 100644
--- a/platformminigbm.h
+++ b/platform/platformminigbm.h
diff --git a/tests/Android.bp b/tests/Android.bp
index 058faa0..7e550ff 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -9,5 +9,5 @@ cc_test {
     header_libs: ["libhardware_headers"],
     static_libs: ["libdrmhwc_utils"],
     shared_libs: ["hwcomposer.drm"],
-    include_dirs: ["external/drm_hwcomposer"],
+    include_dirs: ["external/drm_hwcomposer/include"],
 }
diff --git a/autolock.cpp b/utils/autolock.cpp
index 4e9552a..4e9552a 100644
--- a/autolock.cpp
+++ b/utils/autolock.cpp
diff --git a/hwcutils.cpp b/utils/hwcutils.cpp
index 87e3c42..87e3c42 100644
--- a/hwcutils.cpp
+++ b/utils/hwcutils.cpp
diff --git a/worker.cpp b/utils/worker.cpp
index 0dceb16..0dceb16 100644
--- a/worker.cpp
+++ b/utils/worker.cpp