Enable testing on 2.3 devices

Change-Id: I1a7e293fb1eecc7a46ed10442ab93dd95ea7cce2

diff --git a/README b/README
index ceb23a6..2fe85e5 100644 (file)
--- a/README
+++ b/README
@@ -24,6 +24,10 @@ T.O.C.
 
  gbs build -A [TARGET_ARCH] --spec dali-adaptor-mobile.spec
 
+ Alternatively for latest devices:
+
+ gbs build -A [TARGET_ARCH] --spec dali-adaptor-mobile.spec --define "TIZEN_SDK_2_3 1"
+
 1.3. WEARABLE Profile
 ---------------------
 

diff --git a/adaptors/tizen/framework-tizen.cpp b/adaptors/tizen/framework-tizen.cpp
index c3687b0..8986853 100644 (file)
--- a/adaptors/tizen/framework-tizen.cpp
+++ b/adaptors/tizen/framework-tizen.cpp
@@ -67,7 +67,11 @@ struct Framework::Impl
     mEventCallback.terminate = AppTerminate;
     mEventCallback.pause = AppPause;
     mEventCallback.resume = AppResume;
+#if defined(TIZEN_SDK_2_3)
+    mEventCallback.app_control = AppControl;
+#else
     mEventCallback.service = AppService;
+#endif
     mEventCallback.low_memory = NULL;
     mEventCallback.low_battery = NULL;
     mEventCallback.device_orientation = DeviceRotated;
@@ -128,14 +132,23 @@ struct Framework::Impl
    * Called by AppCore when the application is launched from another module (e.g. homescreen).
    * @param[in] b the bundle data which the launcher module sent
    */
+
+#if defined(TIZEN_SDK_2_3)
+  static void AppControl(app_control_h app_control, void *data)
+#else
   static void AppService(service_h service, void *data)
+#endif
   {
     Framework* framework = static_cast<Framework*>(data);
 
     if(framework)
     {
       bundle *bundleData = NULL;
+#if defined(TIZEN_SDK_2_3)
+      app_control_to_bundle(app_control, &bundleData);
+#else
       service_to_bundle(service, &bundleData);
+#endif
 
       if(bundleData)
       {

diff --git a/packaging/dali-adaptor-mobile.spec b/packaging/dali-adaptor-mobile.spec
index 6793276..721f00e 100644 (file)
--- a/packaging/dali-adaptor-mobile.spec
+++ b/packaging/dali-adaptor-mobile.spec
@@ -123,6 +123,10 @@ LDFLAGS+=" -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--gc-sections "
 CXXFLAGS+=" -D_ARCH_ARM_ -lgcc"
 %endif
 
+%if 0%{?TIZEN_SDK_2_3}
+CXXFLAGS+=" -DTIZEN_SDK_2_3"
+%endif
+
 libtoolize --force
 cd %{_builddir}/%{name}-%{version}/build/tizen
 autoreconf --install