Revert "[Tizen] Replace aul_rsm with screen_connector_provider"

This reverts commit 0e2b6e7e34f7098a569e9acb7e9bf8c6aebb9a16.

Change-Id: I47c784dc7a53c87d0bd02ec95786a25abbf801cb

diff --git a/adaptors/tizen/adaptor-impl-tizen.cpp b/adaptors/tizen/adaptor-impl-tizen.cpp
index 9972162..cd002cd 100644 (file)
--- a/adaptors/tizen/adaptor-impl-tizen.cpp
+++ b/adaptors/tizen/adaptor-impl-tizen.cpp
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <app.h>
 #ifdef APPCORE_WATCH_AVAILABLE
-#include <screen_connector_provider.h>
+#include <aul_rsm_provider.h>
 #include <ecore-wl-render-surface.h>
 #endif
 
@@ -78,7 +78,7 @@ void Adaptor::SurfaceInitialized()
   app_get_id(&appId);
 
   Ecore_Wl_Window* ecoreWlWindow = AnyCast<Ecore_Wl_Window*>( mNativeWindow );
-  screen_connector_provider_remote_enable(appId, ecore_wl_window_surface_get(ecoreWlWindow));
+  aul_rsm_provider_remote_enable(appId, ecore_wl_window_surface_get(ecoreWlWindow));
 #endif
 }
 

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index be88f34..66dac21 100644 (file)
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -395,7 +395,6 @@ libdali_adaptor_la_CXXFLAGS = \
                       $(CAPI_SYSTEM_SENSOR_CFLAGS) \
                       $(LIBDRM_CFLAGS) \
                       $(LIBEXIF_CFLAGS) \
-                      $(SCREENCONNECTORPROVIDER_CFLAGS) \
                       $(LIBCURL_CFLAGS) \
                       $(TPKP_CURL_CFLAGS) \
                       $(UTILX_CFLAGS)
@@ -423,7 +422,6 @@ libdali_adaptor_la_LIBADD = \
                       $(CAPI_SYSTEM_SENSOR_LIBS) \
                       $(LIBDRM_LIBS) \
                       $(LIBEXIF_LIBS) \
-                      $(SCREENCONNECTORPROVIDER_LIBS) \
                       $(LIBCURL_LIBS) \
                       $(HARFBUZZ_LIBS) \
                       $(TPKP_CURL_LIBS) \

diff --git a/build/tizen/adaptor/configure.ac b/build/tizen/adaptor/configure.ac
index 7e612b3..de27247 100644 (file)
--- a/build/tizen/adaptor/configure.ac
+++ b/build/tizen/adaptor/configure.ac
@@ -42,7 +42,6 @@ PKG_CHECK_MODULES(FREETYPE_BITMAP_SUPPORT, [freetype2 >= $FREETYPE_BITMAP_SUPPOR
 PKG_CHECK_MODULES(FONTCONFIG, fontconfig)
 PKG_CHECK_MODULES(PNG, libpng)
 PKG_CHECK_MODULES(LIBEXIF, libexif)
-PKG_CHECK_MODULES(SCREENCONNECTORPROVIDER, screen_connector_provider)
 PKG_CHECK_MODULES(LIBDRM, libdrm)
 PKG_CHECK_MODULES(LIBCURL, libcurl)
 PKG_CHECK_MODULES(HARFBUZZ, harfbuzz)

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index cc6c45f..3e67986 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -92,7 +92,7 @@ BuildRequires:  pkgconfig(glesv2)
 
 BuildRequires:  pkgconfig
 BuildRequires:  gawk
-BuildRequires:  pkgconfig(screen_connector_provider)
+BuildRequires:  pkgconfig(aul)
 BuildRequires:  giflib-devel
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  libjpeg-turbo-devel