Merge branch 'devel/master' into tizen

Change-Id: I065b8d44b52ebe29fd398a76d4efee6b14d4a87c

diff --combined packaging/dali-toolkit.spec
index a6a4f77,82880d2..3065a73
--- 1/packaging/dali-toolkit.spec
--- 2/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:       dali2-toolkit
  Summary:    Dali 3D engine Toolkit
- Version:    2.3.12
+ Version:    2.3.13
  Release:    1
  Group:      System/Libraries
  License:    Apache-2.0 and BSD-3-Clause and MIT
@@@ -21,13 -21,6 +21,13 @@@ BuildRequires:  pkgconfig(egl
  BuildRequires:  gettext
  BuildRequires:  pkgconfig(libtzplatform-config)
  
 +# For ASAN test
 +%if "%{vd_asan}" == "1" || "%{asan}" == "1"
 +BuildRequires: asan-force-options
 +BuildRequires: asan-build-env
 +BuildRequires: libasan
 +%endif
 +
  #############################
  # profile setup
  #############################
@@@ -210,12 -203,6 +210,12 @@@ LDFLAGS+=" --coverage 
  CXXFLAGS+=" -D_ARCH_ARM_"
  %endif
  
 +%if "%{vd_asan}" == "1" || "%{asan}" == "1"
 +CFLAGS+=" -fsanitize=address"
 +CXXFLAGS+=" -fsanitize=address"
 +LDFLAGS+=" -fsanitize=address"
 +%endif
 +
  libtoolize --force
  cd %{_builddir}/dali2-toolkit-%{version}/build/tizen