From: Vyacheslav Cherkashin <v.cherkashin@samsung.com>
Date: Wed, 10 Feb 2016 12:44:22 +0000 (+0300)
Subject: Merge branch 'tizen_2.4_dev' into tizen
X-Git-Tag: accepted/tizen/common/20160316.155427^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d389443b04c7212e3884c25aa1fa2fae2a24f005;p=platform%2Fcore%2Fsystem%2Fswap-manager.git

Merge branch 'tizen_2.4_dev' into tizen

Conflicts:
	scripts/gen_preload_header.sh
	scripts/swap_start.sh

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

d389443b04c7212e3884c25aa1fa2fae2a24f005
diff --cc scripts/gen_preload_header.sh
index 8c667e3,5616a17..6daa30d
--- a/scripts/gen_preload_header.sh
+++ b/scripts/gen_preload_header.sh
@@@ -5,7 -5,10 +5,10 @@@ preload_open_function="dlopen
  handlers_lib="/usr/lib/da_probe_tizen.so"
  linker_path="/lib/"
  linker_sym="_r_debug"
 -test_bin="/usr/bin/WebProcess"
 +test_bin="/bin/su"
+ libc_pkg_name="glibc"
+ libpthread_pkg_name="glibc"
+ libsmack_pkg_name="smack"
  
  output=$1