Fix screenshot on scene transition feature

Change-Id: I66b9d8292df7579d6d290b97db76ef5b281cca5e
Signed-off-by: Vyacheslav Cherkashin <v.cherkashin@samsung.com>

diff --git a/Makefile b/Makefile
index 10ea7cc0c937c1605a49f70c96ee3d94c870fa06..2f9caf389b666d453e0cd1a885c09c635757d7d4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,7 @@ PROBELIB_EVENT=$(LIBDIR)/$(PROBE_EVENT_TARGET)
 PROBELIB_CAPI=$(LIBDIR)/$(PROBE_CAPI_TARGET)
 PROBELIB_GRAPHICS=$(LIBDIR)/$(PROBE_GRAPHICS_TARGET)
 PROBELIB_SCREENSHOT=$(LIBDIR)/$(PROBE_SCREENSHOT_TARGET)
+PROBELIB_UI=$(LIBDIR)/$(PROBE_UI_TARGET)
 PROBELIB_LSAN=$(LIBDIR)/$(LSAN_TARGET)
 PROBELIB_UIHV=$(LIBDIR)/da_ui_viewer.so
 
@@ -97,6 +98,7 @@ CFLAGS+= -DPROBELIB_EVENT=\"$(PROBELIB_EVENT)\"
 CFLAGS+= -DPROBELIB_CAPI=\"$(PROBELIB_CAPI)\"
 CFLAGS+= -DPROBELIB_GRAPHICS=\"$(PROBELIB_GRAPHICS)\"
 CFLAGS+= -DPROBELIB_SCREENSHOT=\"$(PROBELIB_SCREENSHOT)\"
+CFLAGS+= -DPROBELIB_UI=\"$(PROBELIB_UI)\"
 CFLAGS+= -DPROBELIB_LSAN=\"$(PROBELIB_LSAN)\"
 CFLAGS+= -DPROBELIB_UIHV=\"$(PROBELIB_UIHV)\"
 CPPFLAGS = $(INCLUDE_CPPFLAGS) -D_GNU_SOURCE -fPIC

diff --git a/helper/features_list.h b/helper/features_list.h
index 97554682736db20b584cf6ef1149705a64014102..54cfb61d11d35b04c44db52ea1d09f97fa88cf1b 100644 (file)
--- a/helper/features_list.h
+++ b/helper/features_list.h
@@ -36,6 +36,7 @@ static const char probelib_graphics[] = PROBELIB_GRAPHICS;
 static const char probelib_screenshot[] = PROBELIB_SCREENSHOT;
 static const char probelib_lsan[] = PROBELIB_LSAN;
 static const char probelib_uihv[] = PROBELIB_UIHV;
+static const char probelib_ui[] = PROBELIB_UI;
 
 /* Features list, defined in probe_* headers */
 #define FEATURES_LIST \
@@ -53,7 +54,7 @@ static const char probelib_uihv[] = PROBELIB_UIHV;
        X(FL_NETWORK_API_ALWAYS_PROBING,   0,  network_feature_always,   probelib_main) \
        X(FL_THREAD_API_PROBING,           0,  thread_feature,           probelib_main) \
        X(FL_THREAD_API_ALWAYS_PROBING,    0,  thread_feature_always,    probelib_main) \
-       X(FL_SCREENSHOT,                   0,  screenshot_feature,       probelib_screenshot)
+       X(FL_SCREENSHOT,                   0,  ui_feature,               probelib_ui)
 
 
 #endif /* __FEATURES_LIST_H__ */

diff --git a/helper/got_patching.c b/helper/got_patching.c
index cbfff4e9e3c5b9eddd71604c3970b2445812b370..71a3170dc9ea245293e69e0e4c17357839ee244f 100644 (file)
--- a/helper/got_patching.c
+++ b/helper/got_patching.c
@@ -8,7 +8,6 @@
 #include <errno.h>              /* for program_invocation_name */
 
 #include "probeinfo.h"
-#include "probe_screenshot.h"
 #include "probe_helper.h"
 #include "probe_event.h"
 #include "probe_file.h"

diff --git a/helper/loader.c b/helper/loader.c
index e91fef54a198cf050820f3e65e4c9a6f35ef2ae5..c8550417822c1c5037e09eaacd2ebe6568fb246f 100644 (file)
--- a/helper/loader.c
+++ b/helper/loader.c
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include "probeinfo.h"
 #include "dahelper.h"
-#include "probe_screenshot.h"
 #include "probe_helper.h"
 #include "probe_event.h"
 #include "probe_file.h"

diff --git a/probe_screenshot/probe_screenshot.c b/probe_screenshot/probe_screenshot.c
deleted file mode 100644 (file)
index 5779251..0000000
--- a/probe_screenshot/probe_screenshot.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "api_names_global.h"
-#include "probeinfo.h"
-
-/* Screenshot feature has no probes */
-
-struct feature_desc_t screenshot_feature = {
-       .feature = FL_SCREENSHOT,
-       .cnt = 0,
-       .probes = NULL
-};

diff --git a/probe_screenshot/probe_screenshot.h b/probe_screenshot/probe_screenshot.h
deleted file mode 100644 (file)
index b50da88..0000000
--- a/probe_screenshot/probe_screenshot.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __PROBE_SCREENSHOT_H__
-#define __PROBE_SCREENSHOT_H__
-
-extern struct feature_desc_t screenshot_feature;
-
-#endif /* __PROBE_SCREENSHOT_H__ */