From 4f076260d9c8c2649ab0526d04b3727e77eec1be Mon Sep 17 00:00:00 2001
From: Tellen Yu<tellen.yu@amlogic.com>
Date: Mon, 18  Dec  2017  06:33:29  +0000
Subject: Merge "bringup: remove libion from hwc [2/12]" into o-amlogic

---
diff --git a/hwc2/platforms/Android.mk b/hwc2/platforms/Android.mk
index e57368e..5083489 100644
--- a/hwc2/platforms/Android.mk
+++ b/hwc2/platforms/Android.mk
@@ -27,7 +27,6 @@ LOCAL_SRC_FILES := \
     ../common/observers/SoftVsyncObserver.cpp \
     ../common/observers/UeventObserver.cpp \
     ../common/composers/IComposeDevice.cpp \
-    ../common/composers/GE2DComposer.cpp \
     ../common/utils/Utils.cpp \
     ../common/utils/Dump.cpp \
     ../common/utils/AmVinfo.cpp \
@@ -45,7 +44,6 @@ LOCAL_SHARED_LIBRARIES := \
     libhardware \
     libutils \
     libsync \
-    libion \
     libfbcnf \
     libge2d \
     libbinder \
@@ -110,6 +108,9 @@ LOCAL_CFLAGS += -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
 ifeq ($(TARGET_APP_LAYER_USE_CONTINUOUS_BUFFER),true)
 LOCAL_CFLAGS += -DUSE_CONTINOUS_BUFFER_COMPOSER
 # LOCAL_CFLAGS += -DENABLE_AML_GE2D_COMPOSER
+# LOCAL_SRC_FILES += ../common/composers/GE2DComposer.cpp
+# LOCAL_SHARED_LIBRARIES += libion
+
 endif
 
 ifeq ($(TARGET_SUPPORT_SECURE_LAYER),true)
diff --git a/hwc2/platforms/PlatFactory.cpp b/hwc2/platforms/PlatFactory.cpp
index 47a789e..5d263ab 100644
--- a/hwc2/platforms/PlatFactory.cpp
+++ b/hwc2/platforms/PlatFactory.cpp
@@ -45,7 +45,13 @@ IDisplayDevice* PlatFactory::createDisplayDevice(int disp)
 
     class PlatcComposerFactory: public IComposeDeviceFactory {
     public:
-        virtual IComposeDevice* createComposer(IDisplayDevice& disp)       {return new GE2DComposer(disp);}
+        virtual IComposeDevice* createComposer(IDisplayDevice& disp) {
+        #ifdef ENABLE_AML_GE2D_COMPOSER
+            return new GE2DComposer(disp);
+        #else
+            return NULL;
+        #endif
+        }
     };
 
     switch (disp) {
--
cgit