| commit | 9b117a4dd2f143494639a35104e86fef2918750a | [log] [tgz] |
|---|---|---|
| author | Fabien Sanglard <sanglardf@google.com> | Tue Mar 21 09:39:35 2017 -0700 |
| committer | Fabien Sanglard <sanglardf@google.com> | Tue Mar 21 09:43:36 2017 -0700 |
| tree | 0cf95d00521080bac205379a3055bd442190d33e | |
| parent | 10ed93a049186ca86f2bf0ebefc605bb8568f587 [diff] |
Fix library dependency, remove undeclarate deps Remove undeclared dependency of libhwcomposer-client on Hwc.h which created a circular dependency. Test: Manual Change-Id: I74d5c4e2db5d247f8b406d1ea42fece41e76659d
diff --git a/graphics/composer/2.1/default/ComposerClient.cpp b/graphics/composer/2.1/default/ComposerClient.cpp index a2d5d4b..d599b44 100644 --- a/graphics/composer/2.1/default/ComposerClient.cpp +++ b/graphics/composer/2.1/default/ComposerClient.cpp
@@ -21,7 +21,7 @@ #include <log/log.h> #include "ComposerClient.h" -#include "Hwc.h" +#include "ComposerBase.h" #include "IComposerCommandBuffer.h" namespace android {
diff --git a/graphics/composer/2.1/default/ComposerClient.h b/graphics/composer/2.1/default/ComposerClient.h index 14da1f8..c973351 100644 --- a/graphics/composer/2.1/default/ComposerClient.h +++ b/graphics/composer/2.1/default/ComposerClient.h
@@ -21,8 +21,9 @@ #include <unordered_map> #include <vector> -#include "Hwc.h" +#include <hardware/hwcomposer2.h> #include "IComposerCommandBuffer.h" +#include "ComposerBase.h" namespace android { namespace hardware {
diff --git a/graphics/composer/2.1/default/Hwc.cpp b/graphics/composer/2.1/default/Hwc.cpp index e6ff9e0..1497065 100644 --- a/graphics/composer/2.1/default/Hwc.cpp +++ b/graphics/composer/2.1/default/Hwc.cpp
@@ -16,12 +16,12 @@ #define LOG_TAG "HwcPassthrough" -#include <type_traits> +#include "Hwc.h" +#include <type_traits> #include <log/log.h> #include "ComposerClient.h" -#include "Hwc.h" #include "hardware/hwcomposer.h" #include "hwc2on1adapter/HWC2On1Adapter.h"