Add new so names(-cxx11.so*) for DALi to enable dual ABI support.

Change-Id: I6fd179537171fc7546891b01ccd92d11059af070
Signed-off-by: Jaehun Jeong <jh4u.jeong@samsung.com>

diff --git a/rs_resource/NativeAPI/dali-adaptor-rs.xml b/rs_resource/NativeAPI/dali-adaptor-rs.xml
index 24920850b671457fce3bf9332b86e4d0550cf9b9..4988d3f531b94c18d6d37db7ddf24c912ff5da62 100644 (file)
--- a/rs_resource/NativeAPI/dali-adaptor-rs.xml
+++ b/rs_resource/NativeAPI/dali-adaptor-rs.xml
@@ -23,7 +23,8 @@
     <file>/usr/include/dali/public-api/adaptor-framework/timer.h</file>
     <file>/usr/include/dali/public-api/adaptor-framework/tts-player.h</file>
     <file>/usr/include/dali/public-api/adaptor-framework/window.h</file>
-    <file>/usr/lib/libdali-adaptor.so*</file>
+    <file>/usr/lib/libdali-adaptor.so</file>
+    <file>/usr/lib/libdali-adaptor-cxx11.so*</file>
   </necessary>
   <include_path>/usr/include/dali</include_path>
   <library_path>/usr/lib</library_path>

diff --git a/rs_resource/NativeAPI/dali-rs.xml b/rs_resource/NativeAPI/dali-rs.xml
index 504075601320c3c046e05a32785e96cabe00bdd8..1dd13d46430ad295d348e82cbdb666cb39da908b 100644 (file)
--- a/rs_resource/NativeAPI/dali-rs.xml
+++ b/rs_resource/NativeAPI/dali-rs.xml
@@ -132,7 +132,8 @@
     <file>/usr/include/dali/public-api/rendering/texture.h</file>
     <file>/usr/include/dali/public-api/rendering/texture-set.h</file>
 
-    <file>/usr/lib/libdali-core.so*</file>
+    <file>/usr/lib/libdali-core.so</file>
+    <file>/usr/lib/libdali-core-cxx11.so*</file>
   </necessary>
   <include_path>/usr/include/dali</include_path>
   <library_path>/usr/lib</library_path>

diff --git a/rs_resource/NativeAPI/dali-toolkit-rs.xml b/rs_resource/NativeAPI/dali-toolkit-rs.xml
index 5213bf1b99c2d812b8f8b9d7a06b00fa8c0ea85a..33982c8e319a4885eea28a48f3d1beea6b1248e4 100755 (executable)
--- a/rs_resource/NativeAPI/dali-toolkit-rs.xml
+++ b/rs_resource/NativeAPI/dali-toolkit-rs.xml
@@ -75,7 +75,8 @@
 
     <file>/usr/include/dali-toolkit/public-api/toolkit-property-index-ranges.h</file>
 
-    <file>/usr/lib/libdali-toolkit.so*</file>
+    <file>/usr/lib/libdali-toolkit.so</file>
+    <file>/usr/lib/libdali-toolkit-cxx11.so*</file>
   </necessary>
   <include_path>/usr/include/dali-toolkit</include_path>
   <library_path>/usr/lib</library_path>

diff --git a/rs_resource_invisible/dali-adaptor-rs.xml b/rs_resource_invisible/dali-adaptor-rs.xml
index ee57193ce0347a4aed69cee95de519df5a343e5f..1e113b16bc0e976aac40a4826740fac2b8e59b3e 100644 (file)
--- a/rs_resource_invisible/dali-adaptor-rs.xml
+++ b/rs_resource_invisible/dali-adaptor-rs.xml
@@ -25,7 +25,8 @@
     <file>/usr/include/dali/integration-api/adaptors/trigger-event-factory.h</file>
     <file>/usr/include/dali/integration-api/adaptors/wl-types.h</file>
 
-    <file>/usr/lib/libdali-adaptor.so*</file>
+    <file>/usr/lib/libdali-adaptor.so</file>
+    <file>/usr/lib/libdali-adaptor-cxx11.so*</file>
   </necessary>
   <include_path>/usr/include/dali</include_path>
   <library_path>/usr/lib</library_path>

diff --git a/rs_resource_invisible/dali-rs.xml b/rs_resource_invisible/dali-rs.xml
index 6af3ddec02347d261689aaf3773a639b63fc9076..e46f8f92742fee6cce4a804aa89a1b1c29678efb 100644 (file)
--- a/rs_resource_invisible/dali-rs.xml
+++ b/rs_resource_invisible/dali-rs.xml
@@ -43,7 +43,8 @@
     <file>/usr/include/dali/integration-api/events/touch-event-combiner.h</file>
     <file>/usr/include/dali/integration-api/events/touch-event-integ.h</file>
 
-    <file>/usr/lib/libdali-core.so*</file>
+    <file>/usr/lib/libdali-core.so</file>
+    <file>/usr/lib/libdali-core-cxx11.so*</file>
   </necessary>
   <include_path>/usr/include/dali</include_path>
   <library_path>/usr/lib</library_path>