updated busybox 1.8.1->1.16.1 (Android examples)

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@22371 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
scala · Jun 20, 2010 · 4f44352 · 4f44352
1 parent 167a950
commit 4f44352
Show file tree

Hide file tree

Showing 15 changed files with 793 additions and 123 deletions.
diff --git a/docs/android-examples/README.txt b/docs/android-examples/README.txt
@@ -14,7 +14,7 @@ following sources:
      Please read the file README.txt in the "android-sdk" subdirectory.
 
 
-   * Unlocking Android book (http://www.manning.com/ableson/)
+   * Unlocking Android book (http://code.google.com/p/unlocking-android/)
 
      The subdirectory is named "unlocking-android".
 

diff --git a/docs/android-examples/android-sdk/bin/emulator b/docs/android-examples/android-sdk/bin/emulator
@@ -50,8 +50,6 @@ done;
 ROOT=`dirname "$SOURCE"`/..
 ROOT=`cd "$ROOT" > /dev/null && pwd`
 
-IMAGES_DIR=$ROOT/configs/images
-
 ##############################################################################
 ## Set up emulator options
 

diff --git a/docs/android-examples/android-sdk/bin/emulator-maps b/docs/android-examples/android-sdk/bin/emulator-maps
@@ -50,8 +50,6 @@ done;
 ROOT=`dirname "$SOURCE"`/..
 ROOT=`cd "$ROOT" > /dev/null && pwd`
 
-IMAGES_DIR=$ROOT/configs/images
-
 ##############################################################################
 ## Set up emulator options
 

diff --git a/docs/android-examples/android-sdk/bin/emulator-maps.bat b/docs/android-examples/android-sdk/bin/emulator-maps.bat
@@ -17,29 +17,36 @@ if "%ANDROID_SDK_HOME%"=="" (
 if not "%ANDROID_SDK_ROOT%"=="" goto emulator
 
 rem guess1
-if not exist "c:\android-sdk-win32\tools\emulator.exe" goto guess2
+if not exist "%SystemDrive%\android-sdk-win32\tools\emulator.exe" goto guess2
 set ANDROID_SDK_ROOT=c:\android-sdk-win32
 goto emulator
 
 :guess2
-if not exist "c:\Progra~1\android-sdk-win32\tools\emulator.exe" goto error1
+if not exist "%ProgramFiles%\android-sdk-win32\tools\emulator.exe" goto error1
 set ANDROID_SDK_ROOT=c:\Progra~1\android-sdk-win32
 
 :emulator
-
-if "%ANDROID_EMULATOR_OPTS%"=="" (
-  set _EMULATOR_OPTS=-no-boot-anim -no-skin
-) else (
-  set _EMULATOR_OPTS=%ANDROID_EMULATOR_OPTS%
-)
+set _EMULATOR=%ANDROID_SDK_ROOT%\tools\emulator.exe
+if not exist "%_EMULATOR%" goto error2
 
 if "%ANDROID_AVD%"=="" (
-  set _AVD=2.2_128M_HVGA_Google_API
+  set _AVD=2.2_128M_HVGA
 ) else (
   set _AVD=%ANDROID_AVD%
 )
 
 if not exist "%ANDROID_SDK_HOME%\androi~1\avd\%_AVD%.ini" goto error3
+set _AVD_HOME=%ANDROID_SDK_HOME%\androi~1\avd
+
+if "%ANDROID_EMULATOR_OPTS%"=="" (
+  set _EMULATOR_OPTS=-no-boot-anim -no-skin
+  if exist "%_AVD_HOME%\%_AVD%.avd-custom\ramdisk.img%" (
+    set _RAMDISK=%_AVD_HOME%\%_AVD%.avd-custom\ramdisk.img
+  )
+)
+if not "%_RAMDISK"=="" (
+  set _EMULATOR_OPTS=%_EMULATOR_OPTS% -ramdisk "%_RAMDISK%"
+)
 
 rem echo "%_EMULATOR%" %_EMULATOR_OPTS% -avd %_AVD%
 "%_EMULATOR%" %_EMULATOR_OPTS% -avd %_AVD%

diff --git a/docs/android-examples/android-sdk/bin/emulator.bat b/docs/android-examples/android-sdk/bin/emulator.bat
@@ -29,19 +29,24 @@ set ANDROID_SDK_ROOT=%ProgramFiles%\android-sdk-win32
 set _EMULATOR=%ANDROID_SDK_ROOT%\tools\emulator.exe
 if not exist "%_EMULATOR%" goto error2
 
-if "%ANDROID_EMULATOR_OPTS%"=="" (
-  set _EMULATOR_OPTS=-no-boot-anim -no-skin
-) else (
-  set _EMULATOR_OPTS=%ANDROID_EMULATOR_OPTS%
-)
-
 if "%ANDROID_AVD%"=="" (
   set _AVD=2.2_128M_HVGA
 ) else (
   set _AVD=%ANDROID_AVD%
 )
 
 if not exist "%ANDROID_SDK_HOME%\androi~1\avd\%_AVD%.ini" goto error3
+set _AVD_HOME=%ANDROID_SDK_HOME%\androi~1\avd
+
+if "%ANDROID_EMULATOR_OPTS%"=="" (
+  set _EMULATOR_OPTS=-no-boot-anim -no-skin
+  if exist "%_AVD_HOME%\%_AVD%.avd-custom\ramdisk.img%" (
+    set _RAMDISK=%_AVD_HOME%\%_AVD%.avd-custom\ramdisk.img
+  )
+)
+if not "%_RAMDISK"=="" (
+  set _EMULATOR_OPTS=%_EMULATOR_OPTS% -ramdisk "%_RAMDISK%"
+)
 
 rem echo "%_EMULATOR%" %_EMULATOR_OPTS% -avd %_AVD%
 "%_EMULATOR%" %_EMULATOR_OPTS% -avd %_AVD%