From: taeyoon0.lee <taeyoon0.lee@samsung.com>
Date: Wed, 1 Nov 2017 12:34:48 +0000 (+0900)
Subject: [4.0] Fixed build error by CreateNativeSurface
X-Git-Tag: submit/tizen_4.0/20171106.091104~3
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git;a=commitdiff_plain;h=d2ca315320405a6a5f1a027edac2fcee3f66e4c8

[4.0] Fixed build error by CreateNativeSurface

 - Unified build makes additional packages by each profile.
 - In local build, it occurs build error in CreateNativeSurface case.

Change-Id: Icecdc85aa97f1171f9a01b88dbca1ef12dd2255d
---

diff --git a/adaptors/mobile/file.list b/adaptors/mobile/file.list
index 1a294b6..bc73721 100644
--- a/adaptors/mobile/file.list
+++ b/adaptors/mobile/file.list
@@ -4,8 +4,5 @@ adaptor_common_internal_mobile_profile_src_files = \
   $(adaptor_mobile_dir)/mobile-system-settings.cpp \
   $(adaptor_mobile_dir)/mobile-color-controller-impl.cpp
 
-adaptor_common_internal_wayland_mobile_profile_src_files = \
-  $(adaptor_mobile_dir)/native-render-surface-factory.cpp
-
 adaptor_common_internal_x_mobile_profile_src_files = \
   $(adaptor_mobile_dir)/pixmap-render-surface-factory.cpp
diff --git a/adaptors/tizen/file.list b/adaptors/tizen/file.list
index 247a9a3..f7fb694 100644
--- a/adaptors/tizen/file.list
+++ b/adaptors/tizen/file.list
@@ -18,6 +18,7 @@ adaptor_tizen_internal_egl_extension_src_files = \
 adaptor_tizen_internal_native_image_src_files = \
   $(adaptor_tizen_dir)/display-connection-impl-tizen.cpp \
   $(adaptor_tizen_dir)/native-render-surface-tizen.cpp \
+  $(adaptor_tizen_dir)/native-render-surface-factory-tizen.cpp \
   $(adaptor_tizen_dir)/native-image-source-impl-tizen.cpp
 
 public_api_adaptor_tizen_header_files = \
diff --git a/adaptors/mobile/native-render-surface-factory.cpp b/adaptors/tizen/native-render-surface-factory-tizen.cpp
similarity index 100%
rename from adaptors/mobile/native-render-surface-factory.cpp
rename to adaptors/tizen/native-render-surface-factory-tizen.cpp
diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index 2d0ca89..eaeb652 100644
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -167,8 +167,7 @@ adaptor_internal_src_files += $(adaptor_wayland_tizen_internal_src_files)
 endif # USE_ECORE_WAYLAND
 
 adaptor_internal_src_files += $(adaptor_tizen_internal_egl_extension_src_files) \
-                              $(adaptor_tizen_internal_native_image_src_files) \
-                              $(adaptor_common_internal_wayland_mobile_profile_src_files)
+                              $(adaptor_tizen_internal_native_image_src_files)
 else
 adaptor_internal_src_files += $(adaptor_x11_tizen_internal_src_files) \
                               $(adaptor_common_internal_egl_extension_src_files) \
@@ -194,8 +193,7 @@ endif # USE_ECORE_WAYLAND
 
 adaptor_internal_src_files += $(adaptor_tizen_internal_egl_extension_src_files) \
                               $(adaptor_tizen_internal_native_image_src_files) \
-                              $(adaptor_internal_wearable_profile_src_files) \
-                              $(adaptor_common_internal_wayland_mobile_profile_src_files)
+                              $(adaptor_internal_wearable_profile_src_files)
 else
 adaptor_internal_src_files += $(adaptor_x11_tizen_internal_src_files) \
                               $(adaptor_common_internal_egl_extension_src_files) \