diff options
| -rw-r--r-- | Android.bp | 10 | ||||
| -rw-r--r-- | backend/backend.cpp | 1 | ||||
| -rw-r--r-- | backend/backend.h (renamed from include/backend.h) | 0 | ||||
| -rw-r--r-- | backend/backendclient.cpp | 1 | ||||
| -rw-r--r-- | backend/backendclient.h (renamed from include/backendclient.h) | 0 | ||||
| -rw-r--r-- | backend/backendmanager.cpp | 2 | ||||
| -rw-r--r-- | backend/backendmanager.h (renamed from include/backendmanager.h) | 6 | ||||
| -rw-r--r-- | backend/backendrcardu.h (renamed from include/backendrcardu.h) | 0 | ||||
| -rw-r--r-- | compositor/drmdisplaycomposition.cpp | 14 | ||||
| -rw-r--r-- | compositor/drmdisplaycomposition.h (renamed from include/drmdisplaycomposition.h) | 10 | ||||
| -rw-r--r-- | compositor/drmdisplaycompositor.cpp | 18 | ||||
| -rw-r--r-- | compositor/drmdisplaycompositor.h (renamed from include/drmdisplaycompositor.h) | 16 | ||||
| -rw-r--r-- | drm/drmconnector.h (renamed from include/drmconnector.h) | 9 | ||||
| -rw-r--r-- | drm/drmcrtc.h (renamed from include/drmcrtc.h) | 6 | ||||
| -rw-r--r-- | drm/drmdevice.cpp | 5 | ||||
| -rw-r--r-- | drm/drmdevice.h (renamed from include/drmdevice.h) | 9 | ||||
| -rw-r--r-- | drm/drmencoder.cpp | 1 | ||||
| -rw-r--r-- | drm/drmencoder.h (renamed from include/drmencoder.h) | 5 | ||||
| -rw-r--r-- | drm/drmeventlistener.h (renamed from include/drmeventlistener.h) | 2 | ||||
| -rw-r--r-- | drm/drmmode.cpp | 4 | ||||
| -rw-r--r-- | drm/drmmode.h (renamed from include/drmmode.h) | 1 | ||||
| -rw-r--r-- | drm/drmplane.cpp | 1 | ||||
| -rw-r--r-- | drm/drmplane.h (renamed from include/drmplane.h) | 7 | ||||
| -rw-r--r-- | drm/drmproperty.h (renamed from include/drmproperty.h) | 1 | ||||
| -rw-r--r-- | drm/resourcemanager.cpp | 1 | ||||
| -rw-r--r-- | drm/resourcemanager.h (renamed from include/resourcemanager.h) | 6 | ||||
| -rw-r--r-- | drm/vsyncworker.cpp | 4 | ||||
| -rw-r--r-- | drm/vsyncworker.h (renamed from include/vsyncworker.h) | 10 | ||||
| -rw-r--r-- | drmhwctwo.cpp | 14 | ||||
| -rw-r--r-- | drmhwctwo.h (renamed from include/drmhwctwo.h) | 14 | ||||
| -rw-r--r-- | platform/platform.cpp | 3 | ||||
| -rw-r--r-- | platform/platform.h (renamed from include/platform.h) | 6 | ||||
| -rw-r--r-- | platform/platformdrmgeneric.cpp | 2 | ||||
| -rw-r--r-- | platform/platformdrmgeneric.h | 8 | ||||
| -rw-r--r-- | platform/platformhisi.cpp | 4 | ||||
| -rw-r--r-- | platform/platformhisi.h | 1 | ||||
| -rw-r--r-- | platform/platformimagination.cpp | 1 | ||||
| -rw-r--r-- | platform/platformimagination.h | 1 | ||||
| -rw-r--r-- | platform/platformmeson.cpp | 4 | ||||
| -rw-r--r-- | platform/platformmeson.h | 1 | ||||
| -rw-r--r-- | platform/platformminigbm.cpp | 3 | ||||
| -rw-r--r-- | platform/platformminigbm.h | 1 | ||||
| -rw-r--r-- | tests/Android.bp | 5 | ||||
| -rw-r--r-- | tests/worker_test.cpp | 4 | ||||
| -rw-r--r-- | utils/autolock.h (renamed from include/autolock.h) | 0 | ||||
| -rw-r--r-- | utils/hwcutils.cpp | 6 | ||||
| -rw-r--r-- | utils/worker.h (renamed from include/worker.h) | 2 |
47 files changed, 103 insertions, 127 deletions
@@ -20,7 +20,10 @@ cc_library_static { srcs: ["utils/worker.cpp"], - include_dirs: ["external/drm_hwcomposer/include"], + include_dirs: [ + "external/drm_hwcomposer/include", + "external/drm_hwcomposer", + ], cflags: [ "-Wall", @@ -47,7 +50,10 @@ cc_defaults { "libutils", ], - include_dirs: ["external/drm_hwcomposer/include"], + include_dirs: [ + "external/drm_hwcomposer/include", + "external/drm_hwcomposer", + ], static_libs: ["libdrmhwc_utils"], diff --git a/backend/backend.cpp b/backend/backend.cpp index 08ee5a7..e36c47e 100644 --- a/backend/backend.cpp +++ b/backend/backend.cpp @@ -16,7 +16,6 @@ #include "backend.h" #include "backendmanager.h" -#include "drmhwctwo.h" namespace android { diff --git a/include/backend.h b/backend/backend.h index cd9d8cd..cd9d8cd 100644 --- a/include/backend.h +++ b/backend/backend.h diff --git a/backend/backendclient.cpp b/backend/backendclient.cpp index 3f3cd44..a9418da 100644 --- a/backend/backendclient.cpp +++ b/backend/backendclient.cpp @@ -16,7 +16,6 @@ #include "backendclient.h" #include "backendmanager.h" -#include "drmhwctwo.h" namespace android { diff --git a/include/backendclient.h b/backend/backendclient.h index 361160f..361160f 100644 --- a/include/backendclient.h +++ b/backend/backendclient.h diff --git a/backend/backendmanager.cpp b/backend/backendmanager.cpp index 80ec827..03ad704 100644 --- a/backend/backendmanager.cpp +++ b/backend/backendmanager.cpp @@ -17,8 +17,6 @@ #define LOG_TAG "hwc-backend" #include "backendmanager.h" -#include "backend.h" -#include "drmhwctwo.h" #include <cutils/properties.h> #include <log/log.h> diff --git a/include/backendmanager.h b/backend/backendmanager.h index d141652..f18637d 100644 --- a/include/backendmanager.h +++ b/backend/backendmanager.h @@ -17,14 +17,14 @@ #ifndef ANDROID_BACKEND_MANAGER_H #define ANDROID_BACKEND_MANAGER_H -#include "backend.h" -#include "drmhwctwo.h" - #include <functional> #include <map> #include <string> #include <vector> +#include "backend.h" +#include "drmhwctwo.h" + #define REGISTER_BACKEND(name_str_, backend_) \ static int \ backend = BackendManager::GetInstance() \ diff --git a/include/backendrcardu.h b/backend/backendrcardu.h index 29ccea9..29ccea9 100644 --- a/include/backendrcardu.h +++ b/backend/backendrcardu.h diff --git a/compositor/drmdisplaycomposition.cpp b/compositor/drmdisplaycomposition.cpp index b710fe1..82d7194 100644 --- a/compositor/drmdisplaycomposition.cpp +++ b/compositor/drmdisplaycomposition.cpp @@ -17,20 +17,18 @@ #define LOG_TAG "hwc-drm-display-composition" #include "drmdisplaycomposition.h" -#include "drmcrtc.h" -#include "drmdevice.h" -#include "drmdisplaycompositor.h" -#include "drmplane.h" -#include "platform.h" +#include <log/log.h> #include <stdlib.h> +#include <sync/sync.h> +#include <xf86drmMode.h> #include <algorithm> #include <unordered_set> -#include <log/log.h> -#include <sync/sync.h> -#include <xf86drmMode.h> +#include "drm/drmdevice.h" +#include "drmdisplaycompositor.h" +#include "platform/platform.h" namespace android { diff --git a/include/drmdisplaycomposition.h b/compositor/drmdisplaycomposition.h index 2a5b1a4..d8a668c 100644 --- a/include/drmdisplaycomposition.h +++ b/compositor/drmdisplaycomposition.h @@ -17,15 +17,15 @@ #ifndef ANDROID_DRM_DISPLAY_COMPOSITION_H_ #define ANDROID_DRM_DISPLAY_COMPOSITION_H_ -#include "drmcrtc.h" -#include "drmhwcomposer.h" -#include "drmplane.h" +#include <hardware/hardware.h> +#include <hardware/hwcomposer.h> #include <sstream> #include <vector> -#include <hardware/hardware.h> -#include <hardware/hwcomposer.h> +#include "drm/drmcrtc.h" +#include "drm/drmplane.h" +#include "drmhwcomposer.h" namespace android { diff --git a/compositor/drmdisplaycompositor.cpp b/compositor/drmdisplaycompositor.cpp index 1519736..aed090a 100644 --- a/compositor/drmdisplaycompositor.cpp +++ b/compositor/drmdisplaycompositor.cpp @@ -19,23 +19,23 @@ #include "drmdisplaycompositor.h" +#include <drm/drm_mode.h> +#include <log/log.h> #include <pthread.h> #include <sched.h> #include <stdlib.h> +#include <sync/sync.h> #include <time.h> +#include <utils/Trace.h> + #include <array> #include <sstream> #include <vector> -#include <drm/drm_mode.h> -#include <log/log.h> -#include <sync/sync.h> -#include <utils/Trace.h> - -#include "autolock.h" -#include "drmcrtc.h" -#include "drmdevice.h" -#include "drmplane.h" +#include "drm/drmcrtc.h" +#include "drm/drmdevice.h" +#include "drm/drmplane.h" +#include "utils/autolock.h" static const uint32_t kWaitWritebackFence = 100; // ms diff --git a/include/drmdisplaycompositor.h b/compositor/drmdisplaycompositor.h index 26e2572..62dd04e 100644 --- a/include/drmdisplaycompositor.h +++ b/compositor/drmdisplaycompositor.h @@ -17,19 +17,19 @@ #ifndef ANDROID_DRM_DISPLAY_COMPOSITOR_H_ #define ANDROID_DRM_DISPLAY_COMPOSITOR_H_ -#include "drmdisplaycomposition.h" -#include "drmframebuffer.h" -#include "drmhwcomposer.h" -#include "resourcemanager.h" -#include "vsyncworker.h" - +#include <hardware/hardware.h> +#include <hardware/hwcomposer.h> #include <pthread.h> + #include <memory> #include <sstream> #include <tuple> -#include <hardware/hardware.h> -#include <hardware/hwcomposer.h> +#include "drm/resourcemanager.h" +#include "drm/vsyncworker.h" +#include "drmdisplaycomposition.h" +#include "drmframebuffer.h" +#include "drmhwcomposer.h" // One for the front, one for the back, and one for cases where we need to // squash a frame that the hw can't display with hw overlays. diff --git a/include/drmconnector.h b/drm/drmconnector.h index dc64b38..0c19c55 100644 --- a/include/drmconnector.h +++ b/drm/drmconnector.h @@ -17,15 +17,16 @@ #ifndef ANDROID_DRM_CONNECTOR_H_ #define ANDROID_DRM_CONNECTOR_H_ -#include "drmencoder.h" -#include "drmmode.h" -#include "drmproperty.h" - #include <stdint.h> #include <xf86drmMode.h> + #include <string> #include <vector> +#include "drmencoder.h" +#include "drmmode.h" +#include "drmproperty.h" + namespace android { class DrmDevice; diff --git a/include/drmcrtc.h b/drm/drmcrtc.h index 3075f9b..132c2d3 100644 --- a/include/drmcrtc.h +++ b/drm/drmcrtc.h @@ -17,12 +17,12 @@ #ifndef ANDROID_DRM_CRTC_H_ #define ANDROID_DRM_CRTC_H_ -#include "drmmode.h" -#include "drmproperty.h" - #include <stdint.h> #include <xf86drmMode.h> +#include "drmmode.h" +#include "drmproperty.h" + namespace android { class DrmDevice; diff --git a/drm/drmdevice.cpp b/drm/drmdevice.cpp index 91fe158..18b5b62 100644 --- a/drm/drmdevice.cpp +++ b/drm/drmdevice.cpp @@ -17,11 +17,6 @@ #define LOG_TAG "hwc-drm-device" #include "drmdevice.h" -#include "drmconnector.h" -#include "drmcrtc.h" -#include "drmencoder.h" -#include "drmeventlistener.h" -#include "drmplane.h" #include <errno.h> #include <fcntl.h> diff --git a/include/drmdevice.h b/drm/drmdevice.h index 1f08f20..6a8de47 100644 --- a/include/drmdevice.h +++ b/drm/drmdevice.h @@ -17,15 +17,16 @@ #ifndef ANDROID_DRM_H_ #define ANDROID_DRM_H_ +#include <stdint.h> + +#include <tuple> + #include "drmconnector.h" #include "drmcrtc.h" #include "drmencoder.h" #include "drmeventlistener.h" #include "drmplane.h" -#include "platform.h" - -#include <stdint.h> -#include <tuple> +#include "platform/platform.h" namespace android { diff --git a/drm/drmencoder.cpp b/drm/drmencoder.cpp index c36fca1..9aa6805 100644 --- a/drm/drmencoder.cpp +++ b/drm/drmencoder.cpp @@ -15,7 +15,6 @@ */ #include "drmencoder.h" -#include "drmcrtc.h" #include "drmdevice.h" #include <stdint.h> diff --git a/include/drmencoder.h b/drm/drmencoder.h index 8a7f682..4403d9f 100644 --- a/include/drmencoder.h +++ b/drm/drmencoder.h @@ -17,13 +17,14 @@ #ifndef ANDROID_DRM_ENCODER_H_ #define ANDROID_DRM_ENCODER_H_ -#include "drmcrtc.h" - #include <stdint.h> #include <xf86drmMode.h> + #include <set> #include <vector> +#include "drmcrtc.h" + namespace android { class DrmEncoder { diff --git a/include/drmeventlistener.h b/drm/drmeventlistener.h index 95672ee..ff3b8e5 100644 --- a/include/drmeventlistener.h +++ b/drm/drmeventlistener.h @@ -18,7 +18,7 @@ #define ANDROID_DRM_EVENT_LISTENER_H_ #include "autofd.h" -#include "worker.h" +#include "utils/worker.h" namespace android { diff --git a/drm/drmmode.cpp b/drm/drmmode.cpp index c3ab385..c1398ef 100644 --- a/drm/drmmode.cpp +++ b/drm/drmmode.cpp @@ -17,10 +17,6 @@ #include "drmmode.h" #include "drmdevice.h" -#include <stdint.h> -#include <xf86drmMode.h> -#include <string> - namespace android { DrmMode::DrmMode(drmModeModeInfoPtr m) diff --git a/include/drmmode.h b/drm/drmmode.h index 4cc06b1..313a8ea 100644 --- a/include/drmmode.h +++ b/drm/drmmode.h @@ -19,6 +19,7 @@ #include <stdint.h> #include <xf86drmMode.h> + #include <string> namespace android { diff --git a/drm/drmplane.cpp b/drm/drmplane.cpp index 6f1bf9b..f0c7559 100644 --- a/drm/drmplane.cpp +++ b/drm/drmplane.cpp @@ -24,7 +24,6 @@ #include <cinttypes> #include <log/log.h> -#include <xf86drmMode.h> namespace android { diff --git a/include/drmplane.h b/drm/drmplane.h index 43e0e8a..1a4dc91 100644 --- a/include/drmplane.h +++ b/drm/drmplane.h @@ -17,13 +17,14 @@ #ifndef ANDROID_DRM_PLANE_H_ #define ANDROID_DRM_PLANE_H_ -#include "drmcrtc.h" -#include "drmproperty.h" - #include <stdint.h> #include <xf86drmMode.h> + #include <vector> +#include "drmcrtc.h" +#include "drmproperty.h" + namespace android { class DrmDevice; diff --git a/include/drmproperty.h b/drm/drmproperty.h index 2d92ca1..d293da3 100644 --- a/include/drmproperty.h +++ b/drm/drmproperty.h @@ -19,6 +19,7 @@ #include <stdint.h> #include <xf86drmMode.h> + #include <string> #include <vector> diff --git a/drm/resourcemanager.cpp b/drm/resourcemanager.cpp index 986d4ab..45fa818 100644 --- a/drm/resourcemanager.cpp +++ b/drm/resourcemanager.cpp @@ -22,7 +22,6 @@ #include <log/log.h> #include <sys/stat.h> #include <sstream> -#include <string> namespace android { diff --git a/include/resourcemanager.h b/drm/resourcemanager.h index 9fefb46..4afa842 100644 --- a/include/resourcemanager.h +++ b/drm/resourcemanager.h @@ -17,11 +17,11 @@ #ifndef RESOURCEMANAGER_H #define RESOURCEMANAGER_H -#include "drmdevice.h" -#include "platform.h" - #include <string.h> +#include "drmdevice.h" +#include "platform/platform.h" + namespace android { class ResourceManager { diff --git a/drm/vsyncworker.cpp b/drm/vsyncworker.cpp index 08ab301..55dbd26 100644 --- a/drm/vsyncworker.cpp +++ b/drm/vsyncworker.cpp @@ -17,16 +17,12 @@ #define LOG_TAG "hwc-vsync-worker" #include "vsyncworker.h" -#include "drmdevice.h" -#include "worker.h" #include <stdlib.h> #include <time.h> #include <xf86drm.h> #include <xf86drmMode.h> -#include <map> -#include <hardware/hardware.h> #include <log/log.h> namespace android { diff --git a/include/vsyncworker.h b/drm/vsyncworker.h index 96f7432..cbf4ffa 100644 --- a/include/vsyncworker.h +++ b/drm/vsyncworker.h @@ -17,14 +17,14 @@ #ifndef ANDROID_EVENT_WORKER_H_ #define ANDROID_EVENT_WORKER_H_ -#include "drmdevice.h" -#include "worker.h" - +#include <hardware/hardware.h> +#include <hardware/hwcomposer.h> #include <stdint.h> + #include <map> -#include <hardware/hardware.h> -#include <hardware/hwcomposer.h> +#include "drmdevice.h" +#include "utils/worker.h" namespace android { diff --git a/drmhwctwo.cpp b/drmhwctwo.cpp index ffc45ef..c771022 100644 --- a/drmhwctwo.cpp +++ b/drmhwctwo.cpp @@ -18,20 +18,18 @@ #define LOG_TAG "hwc-drm-two" #include "drmhwctwo.h" -#include "backendmanager.h" -#include "drmdisplaycomposition.h" -#include "drmhwcomposer.h" -#include "platform.h" -#include "vsyncworker.h" - -#include <inttypes.h> -#include <string> #include <cutils/properties.h> #include <hardware/hardware.h> #include <hardware/hwcomposer2.h> +#include <inttypes.h> #include <log/log.h> +#include <string> + +#include "backend/backendmanager.h" +#include "compositor/drmdisplaycomposition.h" + namespace android { class DrmVsyncCallback : public VsyncCallback { diff --git a/include/drmhwctwo.h b/drmhwctwo.h index 8b1be4b..94b13fc 100644 --- a/include/drmhwctwo.h +++ b/drmhwctwo.h @@ -17,18 +17,18 @@ #ifndef ANDROID_DRM_HWC_TWO_H_ #define ANDROID_DRM_HWC_TWO_H_ -#include "drmdisplaycompositor.h" -#include "drmhwcomposer.h" -#include "platform.h" -#include "resourcemanager.h" -#include "vsyncworker.h" - #include <hardware/hwcomposer2.h> - #include <math.h> + #include <array> #include <map> +#include "compositor/drmdisplaycompositor.h" +#include "drm/resourcemanager.h" +#include "drm/vsyncworker.h" +#include "drmhwcomposer.h" +#include "platform/platform.h" + namespace android { class Backend; diff --git a/platform/platform.cpp b/platform/platform.cpp index b7a47c7..9fb91e7 100644 --- a/platform/platform.cpp +++ b/platform/platform.cpp @@ -17,10 +17,11 @@ #define LOG_TAG "hwc-platform" #include "platform.h" -#include "drmdevice.h" #include <log/log.h> +#include "drm/drmdevice.h" + namespace android { std::vector<DrmPlane *> Planner::GetUsablePlanes( diff --git a/include/platform.h b/platform/platform.h index 6775e29..e0befdb 100644 --- a/include/platform.h +++ b/platform/platform.h @@ -17,15 +17,15 @@ #ifndef ANDROID_DRM_PLATFORM_H_ #define ANDROID_DRM_PLATFORM_H_ -#include "drmdisplaycomposition.h" -#include "drmhwcomposer.h" - #include <hardware/hardware.h> #include <hardware/hwcomposer.h> #include <map> #include <vector> +#include "compositor/drmdisplaycomposition.h" +#include "drmhwcomposer.h" + namespace android { class DrmDevice; diff --git a/platform/platformdrmgeneric.cpp b/platform/platformdrmgeneric.cpp index b9dafb3..d903031 100644 --- a/platform/platformdrmgeneric.cpp +++ b/platform/platformdrmgeneric.cpp @@ -17,8 +17,6 @@ #define LOG_TAG "hwc-platform-drm-generic" #include "platformdrmgeneric.h" -#include "drmdevice.h" -#include "platform.h" #include <xf86drm.h> #include <xf86drmMode.h> diff --git a/platform/platformdrmgeneric.h b/platform/platformdrmgeneric.h index ad74de4..4284093 100644 --- a/platform/platformdrmgeneric.h +++ b/platform/platformdrmgeneric.h @@ -17,13 +17,13 @@ #ifndef ANDROID_PLATFORM_DRM_GENERIC_H_ #define ANDROID_PLATFORM_DRM_GENERIC_H_ -#include "drmdevice.h" -#include "platform.h" - +#include <drm/drm_fourcc.h> #include <hardware/gralloc.h> + #include <map> -#include <drm/drm_fourcc.h> +#include "drm/drmdevice.h" +#include "platform.h" #ifndef DRM_FORMAT_INVALID #define DRM_FORMAT_INVALID 0 diff --git a/platform/platformhisi.cpp b/platform/platformhisi.cpp index 1f1478f..8c10e34 100644 --- a/platform/platformhisi.cpp +++ b/platform/platformhisi.cpp @@ -17,15 +17,11 @@ #define LOG_TAG "hwc-platform-hisi" #include "platformhisi.h" -#include "drmdevice.h" -#include "platform.h" -#include <stdatomic.h> #include <xf86drm.h> #include <xf86drmMode.h> #include <cinttypes> -#include <hardware/gralloc.h> #include <log/log.h> #include "gralloc_priv.h" diff --git a/platform/platformhisi.h b/platform/platformhisi.h index f127bdb..272e547 100644 --- a/platform/platformhisi.h +++ b/platform/platformhisi.h @@ -17,7 +17,6 @@ #ifndef ANDROID_PLATFORM_HISI_H_ #define ANDROID_PLATFORM_HISI_H_ -#include "drmdevice.h" #include "platform.h" #include "platformdrmgeneric.h" diff --git a/platform/platformimagination.cpp b/platform/platformimagination.cpp index bd4a4c3..83cebf3 100644 --- a/platform/platformimagination.cpp +++ b/platform/platformimagination.cpp @@ -1,6 +1,7 @@ #define LOG_TAG "hwc-platform-imagination" #include "platformimagination.h" + #include <log/log.h> #include <xf86drm.h> diff --git a/platform/platformimagination.h b/platform/platformimagination.h index f2a7cb7..4eec698 100644 --- a/platform/platformimagination.h +++ b/platform/platformimagination.h @@ -1,7 +1,6 @@ #ifndef PLATFORMIMAGINATION_H #define PLATFORMIMAGINATION_H -#include "drmdevice.h" #include "platform.h" #include "platformdrmgeneric.h" diff --git a/platform/platformmeson.cpp b/platform/platformmeson.cpp index ad3aff1..ecace29 100644 --- a/platform/platformmeson.cpp +++ b/platform/platformmeson.cpp @@ -17,15 +17,11 @@ #define LOG_TAG "hwc-platform-meson" #include "platformmeson.h" -#include "drmdevice.h" -#include "platform.h" -#include <stdatomic.h> #include <xf86drm.h> #include <xf86drmMode.h> #include <cinttypes> -#include <hardware/gralloc.h> #include <log/log.h> #include "gralloc_priv.h" diff --git a/platform/platformmeson.h b/platform/platformmeson.h index f29b796..1b428a4 100644 --- a/platform/platformmeson.h +++ b/platform/platformmeson.h @@ -17,7 +17,6 @@ #ifndef ANDROID_PLATFORM_HISI_H_ #define ANDROID_PLATFORM_HISI_H_ -#include "drmdevice.h" #include "platform.h" #include "platformdrmgeneric.h" diff --git a/platform/platformminigbm.cpp b/platform/platformminigbm.cpp index df195d3..39decab 100644 --- a/platform/platformminigbm.cpp +++ b/platform/platformminigbm.cpp @@ -17,13 +17,10 @@ #define LOG_TAG "hwc-platform-drm-minigbm" #include "platformminigbm.h" -#include "drmdevice.h" -#include "platform.h" #include <xf86drm.h> #include <xf86drmMode.h> -#include <hardware/gralloc.h> #include <log/log.h> #include "cros_gralloc_handle.h" diff --git a/platform/platformminigbm.h b/platform/platformminigbm.h index 053b2aa..1eea6ca 100644 --- a/platform/platformminigbm.h +++ b/platform/platformminigbm.h @@ -17,7 +17,6 @@ #ifndef ANDROID_PLATFORM_DRM_MINIGBM_H_ #define ANDROID_PLATFORM_DRM_MINIGBM_H_ -#include "drmdevice.h" #include "platform.h" #include "platformdrmgeneric.h" diff --git a/tests/Android.bp b/tests/Android.bp index 7e550ff..282e71c 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -9,5 +9,8 @@ cc_test { header_libs: ["libhardware_headers"], static_libs: ["libdrmhwc_utils"], shared_libs: ["hwcomposer.drm"], - include_dirs: ["external/drm_hwcomposer/include"], + include_dirs: [ + "external/drm_hwcomposer/include", + "external/drm_hwcomposer", + ], } diff --git a/tests/worker_test.cpp b/tests/worker_test.cpp index 82523f0..ba89b6f 100644 --- a/tests/worker_test.cpp +++ b/tests/worker_test.cpp @@ -1,10 +1,10 @@ +#include "utils/worker.h" + #include <gtest/gtest.h> #include <hardware/hardware.h> #include <chrono> -#include "worker.h" - using android::Worker; struct TestWorker : public Worker { diff --git a/include/autolock.h b/utils/autolock.h index 006406a..006406a 100644 --- a/include/autolock.h +++ b/utils/autolock.h diff --git a/utils/hwcutils.cpp b/utils/hwcutils.cpp index 324d855..2dc7e7b 100644 --- a/utils/hwcutils.cpp +++ b/utils/hwcutils.cpp @@ -17,12 +17,12 @@ #define ATRACE_TAG ATRACE_TAG_GRAPHICS #define LOG_TAG "hwc-drm-utils" -#include "drmhwcomposer.h" -#include "platform.h" - #include <log/log.h> #include <ui/GraphicBufferMapper.h> +#include "drmhwcomposer.h" +#include "platform/platform.h" + #define UNUSED(x) (void)(x) namespace android { diff --git a/include/worker.h b/utils/worker.h index 7909038..73a80da 100644 --- a/include/worker.h +++ b/utils/worker.h @@ -19,10 +19,10 @@ #include <stdint.h> #include <stdlib.h> -#include <string> #include <condition_variable> #include <mutex> +#include <string> #include <thread> namespace android { |