22 files changed, 45 insertions, 1420 deletions

diff --git a/hwc2/include/PrimaryDevice.h b/hwc2/include/PrimaryDevice.h
index 979a5f7..6d88617 100644
--- a/hwc2/include/PrimaryDevice.h
+++ b/hwc2/include/PrimaryDevice.h
@@ -21,7 +21,7 @@
 
 #include <utils/KeyedVector.h>
 #include <PhysicalDevice.h>
-#include <IComposerFactory.h>
+#include <IComposeDeviceFactory.h>
 
 namespace android {
 namespace amlogic {
@@ -29,7 +29,7 @@ namespace amlogic {
 
 class PrimaryDevice : public PhysicalDevice {
 public:
-    PrimaryDevice(Hwcomposer& hwc, DeviceControlFactory *composer);
+    PrimaryDevice(Hwcomposer& hwc, IComposeDeviceFactory *composer);
     virtual ~PrimaryDevice();
 public:
     virtual bool initialize();