Upstream version 8.37.186.0

[platform/framework/web/crosswalk.git] / src / xwalk / application / tools / linux / xwalk_launcher_tizen.cc

diff --git a/src/xwalk/application/tools/linux/xwalk_launcher_tizen.cc b/src/xwalk/application/tools/linux/xwalk_launcher_tizen.cc
index e8ce3fc..f7a83c0 100644 (file)
--- a/src/xwalk/application/tools/linux/xwalk_launcher_tizen.cc
+++ b/src/xwalk/application/tools/linux/xwalk_launcher_tizen.cc
@@ -9,6 +9,7 @@
 #include <appcore/appcore-common.h>
 #include <pkgmgr-info.h>
 
+#include "xwalk/application/common/id_util.h"
 #include "xwalk/application/tools/linux/xwalk_launcher_tizen.h"
 
 enum app_event {
@@ -74,35 +75,18 @@ int xwalk_appcore_init(int argc, char** argv, const char* name) {
 
 int xwalk_change_cmdline(int argc, char** argv, const char* app_id) {
   // Change /proc/<pid>/cmdline to app exec path. See XWALK-1722 for details.
-  gchar* tizen_app_id = g_strconcat("xwalk.", app_id, NULL);
   pkgmgrinfo_appinfo_h handle;
   char* exec_path = NULL;
-  if (pkgmgrinfo_appinfo_get_appinfo(tizen_app_id, &handle) != PMINFO_R_OK ||
+  if (pkgmgrinfo_appinfo_get_appinfo(app_id, &handle) != PMINFO_R_OK ||
       pkgmgrinfo_appinfo_get_exec(handle, &exec_path) != PMINFO_R_OK ||
       !exec_path) {
-    fprintf(stderr, "Couldn't find exec path for application: %s\n",
-            tizen_app_id);
+    fprintf(stderr, "Couldn't find exec path for application: %s\n", app_id);
     return -1;
   }
 
   for (int i = 0; i < argc; ++i)
     memset(argv[i], 0, strlen(argv[i]));
   strncpy(argv[0], exec_path, strlen(exec_path)+1);
-  g_free(tizen_app_id);
   pkgmgrinfo_appinfo_destroy_appinfo(handle);
   return 0;
 }
-
-char* xwalk_extract_app_id(const char* tizen_app_id) {
-  // The Tizen application ID will have a format like
-  // "xwalk.crosswalk_32bytes_app_id".
-  char* app_id = NULL;
-  gchar** tokens = g_strsplit(tizen_app_id, ".", 2);
-  if (g_strv_length(tokens) != 2)
-    fprintf(stderr, "Invalid Tizen AppID, fallback to Crosswalk AppID.\n");
-  else
-    app_id = strdup(tokens[1]);
-
-  g_strfreev(tokens);
-  return app_id;
-}