Merge "composer: remove non-hidl composer compilation"
diff --git a/composer/Android.mk b/composer/Android.mk
index 1f7da7e..970580b 100644
--- a/composer/Android.mk
+++ b/composer/Android.mk
@@ -3,63 +3,6 @@
include $(CLEAR_VARS)
ifeq ($(use_hwc2),true)
-
-LOCAL_MODULE := hwcomposer.$(TARGET_BOARD_PLATFORM)
-LOCAL_VENDOR_MODULE := true
-LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := $(common_includes)
-LOCAL_C_INCLUDES += $(kernel_includes)
-LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
-LOCAL_HEADER_LIBRARIES := display_headers
-
-LOCAL_CFLAGS := -Wno-missing-field-initializers -Wno-unused-parameter \
- -std=c++11 -fcolor-diagnostics\
- -DLOG_TAG=\"SDM\" $(common_flags)
-LOCAL_CLANG := true
-
-LOCAL_SHARED_LIBRARIES := libsdmcore libqservice libbinder libhardware libhardware_legacy \
- libutils libcutils libsync libqdutils libqdMetaData \
- libdisplaydebug libsdmutils libc++ liblog libgrallocutils libui \
- libgpu_tonemapper libhidlbase libhidltransport \
- android.hardware.graphics.mapper@2.0 \
- android.hardware.graphics.mapper@2.1 \
- android.hardware.graphics.mapper@3.0 \
- android.hardware.graphics.allocator@2.0 \
- android.hardware.graphics.allocator@3.0 \
- android.hardware.graphics.composer@2.2 \
- vendor.display.config@1.0 \
- vendor.display.config@1.1 \
- vendor.display.config@1.2 \
- vendor.display.config@1.3 \
- vendor.display.config@1.4 \
- vendor.display.config@1.5 \
- vendor.display.config@1.6 \
- vendor.display.config@1.7 \
- vendor.display.config@1.8 \
- vendor.display.config@1.9 \
- vendor.display.config@1.10
-
-LOCAL_SRC_FILES := hwc_session.cpp \
- hwc_session_services.cpp \
- hwc_display.cpp \
- hwc_display_builtin.cpp \
- hwc_display_pluggable.cpp \
- hwc_display_dummy.cpp \
- hwc_display_pluggable_test.cpp \
- hwc_display_virtual.cpp \
- hwc_debugger.cpp \
- hwc_buffer_sync_handler.cpp \
- hwc_color_manager.cpp \
- hwc_layers.cpp \
- hwc_callbacks.cpp \
- cpuhint.cpp \
- hwc_tonemapper.cpp \
- display_null.cpp \
- hwc_socket_handler.cpp \
- hwc_buffer_allocator.cpp
-
-include $(BUILD_SHARED_LIBRARY)
-
include $(CLEAR_VARS)
LOCAL_MODULE := vendor.qti.hardware.display.composer-service
@@ -67,6 +10,8 @@
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := $(common_includes)
+LOCAL_C_INCLUDES += $(kernel_includes)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
LOCAL_HEADER_LIBRARIES := display_headers
LOCAL_CFLAGS := -Wno-missing-field-initializers -Wno-unused-parameter \
@@ -76,8 +21,10 @@
LOCAL_SHARED_LIBRARIES := libbinder libhardware libutils libcutils libsync \
libc++ liblog libhidlbase libhidltransport \
- hwcomposer.$(TARGET_BOARD_PLATFORM) \
- liblog libfmq \
+ liblog libfmq libhardware_legacy \
+ libsdmcore libqservice libqdutils libqdMetaData \
+ libdisplaydebug libsdmutils libgrallocutils libui \
+ libgpu_tonemapper \
vendor.qti.hardware.display.composer@1.0 \
vendor.qti.hardware.display.composer@2.0 \
android.hardware.graphics.composer@2.1 \
@@ -101,7 +48,27 @@
vendor.display.config@1.10
LOCAL_SRC_FILES := QtiComposer.cpp QtiComposerClient.cpp service.cpp \
- QtiComposerHandleImporter.cpp
+ QtiComposerHandleImporter.cpp \
+ hwc_session.cpp \
+ hwc_session_services.cpp \
+ hwc_display.cpp \
+ hwc_display_builtin.cpp \
+ hwc_display_pluggable.cpp \
+ hwc_display_dummy.cpp \
+ hwc_display_pluggable_test.cpp \
+ hwc_display_virtual.cpp \
+ hwc_debugger.cpp \
+ hwc_buffer_sync_handler.cpp \
+ hwc_color_manager.cpp \
+ hwc_layers.cpp \
+ hwc_callbacks.cpp \
+ cpuhint.cpp \
+ hwc_tonemapper.cpp \
+ display_null.cpp \
+ hwc_socket_handler.cpp \
+ hwc_buffer_allocator.cpp
+
LOCAL_INIT_RC := vendor.qti.hardware.display.composer-service.rc
+
include $(BUILD_EXECUTABLE)
endif