Merge "[4.0] Added capture for wearable" into tizen_4.0
authortaeyoon0.lee <taeyoon0.lee@samsung.com>
Mon, 18 Dec 2017 10:34:51 +0000 (10:34 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Mon, 18 Dec 2017 10:34:51 +0000 (10:34 +0000)
1  2 
adaptors/tizen/file.list
build/tizen/adaptor/Makefile.am

diff --combined adaptors/tizen/file.list
@@@ -21,9 -21,8 +21,12 @@@ adaptor_tizen_internal_native_image_src
    $(adaptor_tizen_dir)/native-render-surface-factory-tizen.cpp \
    $(adaptor_tizen_dir)/native-image-source-impl-tizen.cpp
  
 +adaptor_tizen_internal_widget_src_files = \
 +  $(adaptor_tizen_dir)/widget-application-impl.cpp \
 +  $(adaptor_tizen_dir)/widget-controller.cpp
 +
  public_api_adaptor_tizen_header_files = \
    $(adaptor_tizen_dir)/key-grab.h
+ adaptor_tizen_internal_capture_src_files = \
+   $(adaptor_tizen_dir)/capture-impl-tizen.cpp
@@@ -90,7 -90,6 +90,7 @@@ include ../../../adaptors/public-api/fi
  adaptor_devel_api_dir = ../../../adaptors/devel-api
  include ../../../adaptors/devel-api/file.list
  
 +
  # Static libraries
  static_libraries_libunibreak_src_dir = ../../../text/dali/internal/libunibreak
  include ../../../text/dali/internal/libunibreak/file.list
@@@ -194,7 -193,8 +194,8 @@@ endif # USE_ECORE_WAYLAN
  
  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_internal_wearable_profile_src_files) \
+                               $(adaptor_tizen_internal_capture_src_files)
  else
  adaptor_internal_src_files += $(adaptor_x11_tizen_internal_src_files) \
                                $(adaptor_common_internal_egl_extension_src_files) \
@@@ -258,7 -258,7 +259,7 @@@ endif # IVI_PROFIL
  if USE_APPFW
  if USE_APPFW_EFL_BASE
  else
 -adaptor_internal_src_files += $(adaptor_internal_widget_src_files)
 +adaptor_internal_src_files += $(adaptor_tizen_internal_widget_src_files)
  endif
  endif
  
@@@ -353,6 -353,12 +354,12 @@@ LIBDALI_ADAPTOR_LA_includes += 
                        -I../../../adaptors/tizen
  endif
  
+ if WEARABLE_PROFILE
+ LIBDALI_ADAPTOR_LA_includes += \
+                       -I../../../adaptors/wearable \
+                       -I../../../adaptors/wearable/capture
+ endif
  daliDefaultThemeDir  = ${dataReadWriteDir}/theme/
  daliShaderbinCacheDir = ${dataReadOnlyDir}/core/shaderbin/
  
@@@ -586,6 -592,9 +593,9 @@@ tizenadaptorpublicapi_HEADERS += $(adap
  tizenwatchpublicapidir = $(tizenadaptorpublicapidir)/watch
  tizenwatchpublicapi_HEADERS = $(public_dali_watch_header_files)
  
+ tizencapturepublicapidir = $(tizenadaptorpublicapidir)/capture
+ tizencapturepublicapi_HEADERS = $(public_dali_capture_header_files)
  if USE_APPFW
  if USE_APPFW_EFL_BASE
  else