| author | Tellen Yu <tellen.yu@amlogic.com> | 2017-12-18 06:33:29 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@scgit.amlogic.com> | 2017-12-18 06:33:29 (GMT) |
| commit | 4f076260d9c8c2649ab0526d04b3727e77eec1be (patch) | |
| tree | e250a8bbc4818d0134b2b51c3e58b40b67d42510 | |
| parent | 68960283c2f84e369c580ab43dfda9e5565b7b2d (diff) | |
| parent | 056fadb26d2d2fa54d6caf6fb8133f7336baf3f4 (diff) | |
| download | hwcomposer-4f076260d9c8c2649ab0526d04b3727e77eec1be.zip hwcomposer-4f076260d9c8c2649ab0526d04b3727e77eec1be.tar.gz hwcomposer-4f076260d9c8c2649ab0526d04b3727e77eec1be.tar.bz2 | |
Merge "bringup: remove libion from hwc [2/12]" into o-amlogic
| -rw-r--r-- | hwc2/platforms/Android.mk | 5 | ||||
| -rw-r--r-- | hwc2/platforms/PlatFactory.cpp | 8 |
2 files changed, 10 insertions, 3 deletions
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) { |