[Title]add code to check device architecture

[Type]enhancement
[Module]common
[Redmine#]7335

Change-Id: Ie83bb3c599d087e7d301c144adf777c036cce683

diff --git a/org.tizen.common.connection/src/org/tizen/common/connection/ConnectionPlugin.java b/org.tizen.common.connection/src/org/tizen/common/connection/ConnectionPlugin.java
index 4411a11..286d129 100755 (executable)
--- a/org.tizen.common.connection/src/org/tizen/common/connection/ConnectionPlugin.java
+++ b/org.tizen.common.connection/src/org/tizen/common/connection/ConnectionPlugin.java
@@ -47,6 +47,7 @@ import org.tizen.common.util.FileUtil;
 import org.tizen.common.util.OSChecker;
 import org.tizen.common.util.log.Logger;
 import org.tizen.sdblib.FileListingService.FileEntry;
+import org.tizen.sdblib.IDevice.Arch;
 import org.tizen.sdblib.IDevice;
 import org.tizen.sdblib.SmartDevelopmentBridge;
 
@@ -190,7 +191,7 @@ public class ConnectionPlugin extends AbstractUIPlugin {
         if ( !packagename.equals(name) ) {
             return null;
         }
-        if (device.isEmulator()) {
+        if (device.isEmulator() && device.getArch() == Arch.X86) {
             if ( !architecture.contains("86")) {
                 return null;
             }
@@ -221,7 +222,7 @@ public class ConnectionPlugin extends AbstractUIPlugin {
         }
         String architecture = arch[0];
 
-        if (device.isEmulator()) {
+        if (device.isEmulator() && device.getArch() == Arch.X86) {
             if (!architecture.equals("i386"))
             {
                 return null;

diff --git a/org.tizen.common.connection/src/org/tizen/common/connection/debugtools/ToolsInstall.java b/org.tizen.common.connection/src/org/tizen/common/connection/debugtools/ToolsInstall.java
index cd67d07..6a0bff6 100755 (executable)
--- a/org.tizen.common.connection/src/org/tizen/common/connection/debugtools/ToolsInstall.java
+++ b/org.tizen.common.connection/src/org/tizen/common/connection/debugtools/ToolsInstall.java
@@ -53,6 +53,7 @@ import org.tizen.common.util.SdbCommandUtil;
 import org.tizen.common.util.log.Logger;
 import org.tizen.sdblib.IDevice;
 import org.tizen.sdblib.SdbShellProcess;
+import org.tizen.sdblib.IDevice.Arch;
 
 class PackageInstallMonitorDialog extends ProgressMonitorDialog {
     public PackageInstallMonitorDialog(Shell parent) {
@@ -218,7 +219,7 @@ class InstallProgress implements IRunnableWithProgress {
         String threadName = "";
         // install loop (cp, tar)
         for ( DebugTool dt : installDebugTools ) {
-            if (device.isEmulator()) {
+            if (device.isEmulator() && device.getArch() == Arch.X86) {
                 if (!dt.getArchitecture().contains("86"))
                 {
                     continue;

diff --git a/org.tizen.common/lib/sdblib.jar b/org.tizen.common/lib/sdblib.jar
index 1b8554f..6c5fda6 100644 (file)
Binary files a/org.tizen.common/lib/sdblib.jar and b/org.tizen.common/lib/sdblib.jar differ