commit 09aa9774a68528f2269813833e2313e20d60d0d3
author Siva Velusamy <vsiva@google.com> Mon Oct 08 15:15:05 2012 -0700
committer Siva Velusamy <vsiva@google.com> Mon Oct 08 15:15:05 2012 -0700
tree 64dcee82d68254a48d887b1fc0c034f6abb367a5
parent 3a590a561a025001f8b90de8a324a68a9b753a6f

Obtain path to dynamic skin layout folder from sdk root

Change-Id: Id83e082238f696aaa0c330020e3310b20ebe5a32

android/main-common.c

diff --git a/android/main-common.c b/android/main-common.c
index f15f250..b724e4b 100644
--- a/android/main-common.c
+++ b/android/main-common.c
@@ -24,6 +24,7 @@
 
 #include "console.h"
 
+#include "android/avd/util.h"
 #include "android/utils/debug.h"
 #include "android/utils/path.h"
 #include "android/utils/bufprint.h"
@@ -413,7 +414,7 @@
 
 int
 load_dynamic_skin(AndroidHwConfig* hwConfig,
-                  const char*      skinDirPath,
+                  char**           skinDirPath,
                   int              width,
                   int              height,
                   AConfig*         root)
@@ -422,15 +423,22 @@
     AConfig*  node;
     int       i;
     int       max_part_width;
+    char      fromEnv;
+    char*     sdkRoot = path_getSdkRoot(&fromEnv);
 
-    if (skinDirPath == NULL)
+    if (sdkRoot == NULL) {
+        dwarning("Unable to locate sdk root. Will not use dynamic skin.");
         return 0;
+    }
 
-    snprintf(tmp, sizeof(tmp), "%s/dynamic", skinDirPath);
+    snprintf(tmp, sizeof(tmp), "%s/tools/lib/emulator/skins/dynamic/", sdkRoot);
+    free(sdkRoot);
+
     if (!path_exists(tmp))
         return 0;
 
-    snprintf(tmp, sizeof(tmp), "%s/dynamic/layout", skinDirPath);
+    *skinDirPath = strdup(tmp);
+    snprintf(tmp, sizeof(tmp), "%s/layout", *skinDirPath);
     D("trying to load skin file '%s'", tmp);
 
     if(aconfig_load_file(root, tmp) < 0) {
@@ -600,9 +608,9 @@
             }
 
             if (opts->dynamic_skin) {
-                if (load_dynamic_skin(hwConfig, skinDirPath, width, height, root)) {
-                    snprintf(tmp, sizeof tmp, "%s/dynamic/", skinDirPath);
-                    path = tmp;
+                char *dynamicSkinDirPath;
+                if (load_dynamic_skin(hwConfig, &dynamicSkinDirPath, width, height, root)) {
+                    path = dynamicSkinDirPath;
                     D("loaded dynamic skin width=%d height=%d bpp=%d\n", width, height, bpp);
                     goto FOUND_SKIN;
                 }