AI 145976: am: CL 145806 Add qemud-version auto-detection logic to android/hw-qemud.c

  Document the supported QEMUD services in known Android systems
  Print "Press F6 to exit trackball mode..." in the window title bar when one
  activates the persistent trackball mode. The actual text depends on your
  key binding configuration.
  Refine the skin directory auto-search paths when an AVD name is not given on the
  command line. This makes the following work correctly:
  tools/emulator -sysdir platforms/android-1.5/images -data foo.img
  Original author: digit
  Merged from: //branches/cupcake/...

Automated import of CL 145976

1 files changed, 12 insertions, 3 deletions

diff --git a/android/avd/info.c b/android/avd/info.c
index ec74249..1bdb59c 100644
--- a/android/avd/info.c
+++ b/android/avd/info.c
@@ -1281,9 +1281,18 @@ _getBuildSkin( AvdInfo*  i, AvdInfoParams*  params )
 
 #define  PREBUILT_SKINS_DIR  "development/emulator/skins"
 
-        /* the (current) default skin directory */
-        p = bufprint( temp, end, "%s/%s",
-                      i->androidBuildRoot, PREBUILT_SKINS_DIR );
+        do {
+            /* try in <sysdir>/../skins first */
+            p = bufprint( temp, end, "%s/../skins",
+                          i->androidBuildRoot );
+            if (path_exists(temp))
+                break;
+
+            /* the (current) default skin directory */
+            p = bufprint( temp, end, "%s/%s",
+                        i->androidBuildRoot, PREBUILT_SKINS_DIR );
+        } while (0);
+
     } else {
         p = bufprint( temp, end, "%s", skinDir );
     }