branch Attitude Adjustment

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@33625 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 263 insertions, 0 deletions

diff --git a/package/goldfish-qemu/patches/100-darwin_fix.patch b/package/goldfish-qemu/patches/100-darwin_fix.patch
new file mode 100644
index 000000000..a5f56b3cf
--- /dev/null
+++ b/package/goldfish-qemu/patches/100-darwin_fix.patch
@@ -0,0 +1,30 @@
+--- a/android-configure.sh
++++ b/android-configure.sh
+@@ -656,6 +656,9 @@ case "$CPU" in
+     *) HOST_CPU=$CPU
+     ;;
+ esac
++case "$OS" in
++    darwin*) echo "#define _BSD	1" >> $config_h;;
++esac
+ echo "#define HOST_$HOST_CPU    1" >> $config_h
+ log "Generate   : $config_h"
+ 
+--- a/android/utils/display-quartz.m
++++ b/android/utils/display-quartz.m
+@@ -34,6 +34,7 @@ get_monitor_resolution( int  *px_dpi, in
+ int
+ get_nearest_monitor_rect( int  *x, int  *y, int  *width, int  *height )
+ {
++#if 0
+     SDL_SysWMinfo  info;
+     NSWindow*      window;
+ 
+@@ -108,4 +109,7 @@ get_nearest_monitor_rect( int  *x, int  
+         }
+         return 0;
+     }
++#else
++	return -1;
++#endif
+ };
diff --git a/package/goldfish-qemu/patches/110-single_image.patch b/package/goldfish-qemu/patches/110-single_image.patch
new file mode 100644
index 000000000..92a9e543d
--- /dev/null
+++ b/package/goldfish-qemu/patches/110-single_image.patch
@@ -0,0 +1,233 @@
+--- a/android/cmdline-option.c
++++ b/android/cmdline-option.c
+@@ -50,16 +50,6 @@ android_parse_options( int  *pargc, char
+         char   arg2_tab[64], *arg2 = arg2_tab;
+         int    nn;
+ 
+-        /* process @<name> as a special exception meaning
+-         * '-avd <name>'
+-         */
+-        if (aread[0][0] == '@') {
+-            opt->avd = aread[0]+1;
+-            nargs--;
+-            aread++;
+-            continue;
+-        }
+-
+         /* anything that isn't an option past this points
+          * exits the loop
+          */
+--- a/android/cmdline-options.h
++++ b/android/cmdline-options.h
+@@ -60,21 +60,16 @@
+  */
+ 
+ CFG_PARAM( sysdir,  "<dir>",  "search for system disk images in <dir>" )
+-CFG_PARAM( system,  "<file>", "read initial system image from <file>" )
+-CFG_PARAM( datadir, "<dir>",  "write user data into <dir>" )
+-CFG_PARAM( kernel,  "<file>", "use specific emulated kernel" )
+-CFG_PARAM( ramdisk, "<file>", "ramdisk image (default <system>/ramdisk.img" )
+-CFG_PARAM( image,   "<file>", "obsolete, use -system <file> instead" )
+-CFG_PARAM( init_data, "<file>", "initial data image (default <system>/userdata.img" )
+-CFG_PARAM( initdata, "<file>", "same as '-init-data <file>'" )
+-CFG_PARAM( data,     "<file>", "data image (default <datadir>/userdata-qemu.img" )
++CFG_PARAM( system,  "<file>", "read system image from <file>, default: <system>/system.img" )
++CFG_PARAM( data,     "<file>", "data image, default: <system>/data.img" )
++CFG_PARAM( kernel,  "<file>", "use specific emulated kernel, default: kernel.bin" )
++CFG_PARAM( ramdisk, "<file>", "ramdisk image (default <system>/ramdisk.bin" )
+ CFG_PARAM( partition_size, "<size>", "system/data partition size in MBs" )
+ CFG_PARAM( cache,    "<file>", "cache partition image (default is temporary file)" )
+ CFG_FLAG ( no_cache, "disable the cache partition" )
+ CFG_FLAG ( nocache,  "same as -no-cache" )
+ OPT_PARAM( sdcard, "<file>", "SD card image (default <system>/sdcard.img")
+ OPT_FLAG ( wipe_data, "reset the use data image (copy it from initdata)" )
+-CFG_PARAM( avd, "<name>", "use a specific android virtual device" )
+ CFG_PARAM( skindir, "<dir>", "search skins in <dir> (default <system>/skins)" )
+ CFG_PARAM( skin, "<name>", "select a given skin" )
+ CFG_FLAG ( no_skin, "don't use any emulator skin" )
+--- a/android/main.c
++++ b/android/main.c
+@@ -1606,6 +1606,7 @@ report_console( const char*  proto_port,
+  *       containing 'fileName'. this is *not* the full
+  *       path to 'fileName'.
+  */
++
+ static char*
+ _getSdkImagePath( const char*  fileName )
+ {
+@@ -1617,8 +1618,6 @@ _getSdkImagePath( const char*  fileName 
+ 
+     static const char* const  searchPaths[] = {
+         "",                                  /* program's directory */
+-        "/lib/images",                       /* this is for SDK 1.0 */
+-        "/../platforms/android-1.1/images",  /* this is for SDK 1.1 */
+         NULL
+     };
+ 
+@@ -1841,25 +1840,7 @@ int main(int argc, char **argv)
+         }
+     }
+ 
+-    /* legacy support: we used to use -system <dir> and -image <file>
+-     * instead of -sysdir <dir> and -system <file>, so handle this by checking
+-     * whether the options point to directories or files.
+-     */
+-    if (opts->image != NULL) {
+-        if (opts->system != NULL) {
+-            if (opts->sysdir != NULL) {
+-                derror( "You can't use -sysdir, -system and -image at the same time.\n"
+-                        "You should probably use '-sysdir <path> -system <file>'.\n" );
+-                exit(2);
+-            }
+-        }
+-        dwarning( "Please note that -image is obsolete and that -system is now used to point\n"
+-                  "to the system image. Next time, try using '-sysdir <path> -system <file>' instead.\n" );
+-        opts->sysdir = opts->system;
+-        opts->system = opts->image;
+-        opts->image  = NULL;
+-    }
+-    else if (opts->system != NULL && path_is_dir(opts->system)) {
++    if (opts->system != NULL && path_is_dir(opts->system)) {
+         if (opts->sysdir != NULL) {
+             derror( "Option -system should now be followed by a file path, not a directory one.\n"
+                     "Please use '-sysdir <path>' to point to the system directory.\n" );
+@@ -1885,49 +1866,11 @@ int main(int argc, char **argv)
+     if (opts->noskin)
+         opts->no_skin = opts->noskin;
+ 
+-    if (opts->initdata) {
+-        opts->init_data = opts->initdata;
+-        opts->initdata  = NULL;
+-    }
+-
+-    /* If no AVD name was given, try to find the top of the
+-     * Android build tree
+-     */
+-    if (opts->avd == NULL) {
+-        do {
+-            char*  out = getenv("ANDROID_PRODUCT_OUT");
+-
+-            if (out == NULL || out[0] == 0)
+-                break;
+-
+-            if (!path_exists(out)) {
+-                derror("Can't access ANDROID_PRODUCT_OUT as '%s'\n"
+-                    "You need to build the Android system before launching the emulator",
+-                    out);
+-                exit(2);
+-            }
+-
+-            android_build_root = path_parent( out, 4 );
+-            if (android_build_root == NULL || !path_exists(android_build_root)) {
+-                derror("Can't find the Android build root from '%s'\n"
+-                    "Please check the definition of the ANDROID_PRODUCT_OUT variable.\n"
+-                    "It should point to your product-specific build output directory.\n",
+-                    out );
+-                exit(2);
+-            }
+-            android_build_out = out;
+-            D( "found Android build root: %s", android_build_root );
+-            D( "found Android build out:  %s", android_build_out );
+-        } while (0);
+-    }
+     /* if no virtual device name is given, and we're not in the
+      * Android build system, we'll need to perform some auto-detection
+      * magic :-)
+      */
+-    if (opts->avd == NULL && !android_build_out) 
+     {
+-        char   dataDirIsSystem = 0;
+-
+         if (!opts->sysdir) {
+             opts->sysdir = _getSdkImagePath("system.img");
+             if (!opts->sysdir) {
+@@ -1945,47 +1888,30 @@ int main(int argc, char **argv)
+         }
+ 
+         if (!opts->system) {
+-            opts->system = _getSdkSystemImage(opts->sysdir, "-image", "system.img");
+-            D("autoconfig: -image %s", opts->image);
++            opts->system = _getSdkSystemImage(opts->sysdir, "-system", "system.img");
++            D("autoconfig: -system %s", opts->system);
+         }
+ 
+         if (!opts->kernel) {
+-            opts->kernel = _getSdkSystemImage(opts->sysdir, "-kernel", "kernel-qemu");
++            opts->kernel = _getSdkSystemImage(opts->sysdir, "-kernel", "kernel.bin");
+             D("autoconfig: -kernel %s", opts->kernel);
+         }
+ 
+         if (!opts->ramdisk) {
+-            opts->ramdisk = _getSdkSystemImage(opts->sysdir, "-ramdisk", "ramdisk.img");
++            opts->ramdisk = _getSdkSystemImage(opts->sysdir, "-ramdisk", "ramdisk.bin");
+             D("autoconfig: -ramdisk %s", opts->ramdisk);
+         }
+ 
+-        /* if no data directory is specified, use the system directory */
+-        if (!opts->datadir) {
+-            opts->datadir   = qemu_strdup(opts->sysdir);
+-            dataDirIsSystem = 1;
+-            D("autoconfig: -datadir %s", opts->sysdir);
+-        }
+-
+         if (!opts->data) {
+             /* check for userdata-qemu.img in the data directory */
+-            bufprint(tmp, tmpend, "%s/userdata-qemu.img", opts->datadir);
+-            if (!path_exists(tmp)) {
+-                derror(
+-                "You did not provide the name of an Android Virtual Device\n"
+-                "with the '-avd <name>' option. Read -help-avd for more information.\n\n"
+-
+-                "If you *really* want to *NOT* run an AVD, consider using '-data <file>'\n"
+-                "to specify a data partition image file (I hope you know what you're doing).\n"
+-                );
+-                exit(2);
+-            }
++            bufprint(tmp, tmpend, "%s/data.img", opts->sysdir);
+ 
+             opts->data = qemu_strdup(tmp);
+             D("autoconfig: -data %s", opts->data);
+         }
+ 
+-        if (!opts->sdcard && opts->datadir) {
+-            bufprint(tmp, tmpend, "%s/sdcard.img", opts->datadir);
++        if (!opts->sdcard && opts->sysdir) {
++            bufprint(tmp, tmpend, "%s/sdcard.img", opts->sysdir);
+             if (path_exists(tmp)) {
+                 opts->sdcard = qemu_strdup(tmp);
+                 D("autoconfig: -sdcard %s", opts->sdcard);
+@@ -2029,19 +1955,6 @@ int main(int argc, char **argv)
+     android_avdParams->skinName     = opts->skin;
+     android_avdParams->skinRootPath = opts->skindir;
+ 
+-    /* setup the virtual device differently depending on whether
+-     * we are in the Android build system or not
+-     */
+-    if (opts->avd != NULL)
+-    {
+-        android_avdInfo = avdInfo_new( opts->avd, android_avdParams );
+-        if (android_avdInfo == NULL) {
+-            /* an error message has already been printed */
+-            dprint("could not find virtual device named '%s'", opts->avd);
+-            exit(1);
+-        }
+-    }
+-    else
+     {
+         if (!android_build_out) {
+             android_build_out = android_build_root = opts->sysdir;
+--- a/android/avd/info.c
++++ b/android/avd/info.c
+@@ -1233,10 +1233,8 @@ _getBuildImagePaths( AvdInfo*  i, AvdInf
+      ** take care of checking the state
+      **/
+     imageLoader_set ( l, AVD_IMAGE_INITSYSTEM );
+-    imageLoader_load( l, IMAGE_REQUIRED | IMAGE_DONT_LOCK );
+-
+-    /* force the system image to read-only status */
+-    l->pState[0] = IMAGE_STATE_READONLY;
++    l->pState[0] = IMAGE_STATE_MUSTLOCK;
++    imageLoader_load( l, IMAGE_REQUIRED );
+ 
+     /** cache partition handling
+      **/