Upload tizen_2.1 source

Change-Id: Ie7ba32c0aba9e5510ba4502ad6897ba9979578c6

diff --git a/org.tizen.common.sdblib/src/org/tizen/sdblib/Device.java b/org.tizen.common.sdblib/src/org/tizen/sdblib/Device.java
index 59242bd..22b2ae0 100644 (file)
--- a/org.tizen.common.sdblib/src/org/tizen/sdblib/Device.java
+++ b/org.tizen.common.sdblib/src/org/tizen/sdblib/Device.java
@@ -45,7 +45,7 @@ final class Device implements IDevice {
     private String mSerialNumber = null;
     private boolean mIsEmulator = false;
 
-    private Arch mArch = Arch.ARM;
+    private Arch mArch = Arch.X86;
 
     private String mDeviceName = null;
 

diff --git a/org.tizen.common/src/org/tizen/common/TizenPlatformConstants.java b/org.tizen.common/src/org/tizen/common/TizenPlatformConstants.java
index 767f202..bc8cdb3 100644 (file)
--- a/org.tizen.common/src/org/tizen/common/TizenPlatformConstants.java
+++ b/org.tizen.common/src/org/tizen/common/TizenPlatformConstants.java
@@ -63,6 +63,7 @@ public class TizenPlatformConstants {
     public static final String GDBSERVER_CMD;
     public static final String GDBSERVER_PLATFORM_CMD;
     public static final String ATTACH_OPTION = " --attach ";
+    public static final String DEBUG_ATTACH_CMD_FORMAT;
     public static final String HOST_GDBSERVER_PATH = "/usr/bin/gdbserver";
 
     // Definitions for installing
@@ -162,6 +163,7 @@ public class TizenPlatformConstants {
         DLOGUTIL_CMD = "/usr/bin/dlogutil %s";
         SDK_ROOT_COMMAND = "/usr/bin/da_command";
         PROCESS_GET_PROCESS_ID_COMMAND = SDK_ROOT_COMMAND + " process | grep '%s' | grep -v grep | awk '{print $2}'";
+        DEBUG_ATTACH_CMD_FORMAT = "-m debug -P %s -attach %s";
     }
 
     /**

diff --git a/org.tizen.common/src/org/tizen/common/sdb/command/SdbCommand.java b/org.tizen.common/src/org/tizen/common/sdb/command/SdbCommand.java
index 395a95f..bd8b841 100644 (file)
--- a/org.tizen.common/src/org/tizen/common/sdb/command/SdbCommand.java
+++ b/org.tizen.common/src/org/tizen/common/sdb/command/SdbCommand.java
@@ -80,8 +80,9 @@ public class SdbCommand {
     
     public Process runLaunchCommand(String command, boolean isBlock) throws IOException {
         Process process = null;
+        String serialNumber = device.getSerialNumber();
         if (console != null) {
-            console.println("$ sdb launch " + command);
+            console.println("$ sdb -s " + serialNumber + " launch " + command);
         }
         
         if ( isBlock ) {
@@ -99,9 +100,11 @@ public class SdbCommand {
             if (sdbPath == null) {
                 throw new IOException("Cannot find sdb command");
             }
-            process = Runtime.getRuntime().exec(sdbPath + " launch " + command);
+            
+            String sdbShellCmd = sdbPath + " -s " + serialNumber + " launch " + command;
+            process = Runtime.getRuntime().exec(sdbShellCmd);
         }
-        
+
         return process;
     }
 

diff --git a/package/changelog b/package/changelog
index 72f85a0..98a4f9c 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,9 @@
+* 2.1.36
+- Changed default value for device architecture to X86
+== kh5325.kim <ho.namkoong@samsung.com> 2013-04-22
+* 2.1.35
+- Added "-s" option of "sdb launch"
+== gune.kim <gune.kim@samsung.com> 2013-04-19
 * 2.1.34
 - updated Tizen Web UI FW to 0.2.25
 == jihoon80.song <jihoon80.song@samsung.com> 2013-04-19 14:58

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index ed316c5..8e1b0ee 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:2.1.34
+Version:2.1.36
 Source:common-eplugin
 Maintainer:kangho kim <kh5325.kim@samsung.com>, yoonki park <yoonki.park@samsung.com>, hyunsik non <hyunsik.noh@samsung.com>, taeyoung son <taeyoung2.son@samsung.com>, gune Kim <gune.kim@samsung.com>, ho namkoong <ho.namkoong@samsung.com>, hyeongseok heo <hyeong-seok.heo@samsung.com>, gyeongseok seo <gyeongseok.seo@samsung.com>, jihoon song <jihoon80.song@samsung.com>, changhyun lee <changhyun1.lee@samsung.com>, bonyong lee <bonyong.lee@samsung.com>