diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-13 13:04:19 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-13 13:04:19 -0700 |
commit | 6bce2058567443a02cf80ee3692ff97139b63579 (patch) | |
tree | fa8f9e35bd8feb708c89c367ba99e562ee3b9d03 /tools | |
parent | fdd3a1020cc63c9f2440f3cff814318d11d6c773 (diff) | |
download | build-6bce2058567443a02cf80ee3692ff97139b63579.zip build-6bce2058567443a02cf80ee3692ff97139b63579.tar.gz build-6bce2058567443a02cf80ee3692ff97139b63579.tar.bz2 |
auto import from //branches/cupcake_rel/...@138607
Diffstat (limited to 'tools')
-rw-r--r-- | tools/dexpreopt/dexopt-wrapper/DexOptWrapper.cpp | 2 | ||||
-rwxr-xr-x | tools/dexpreopt/dexpreopt.py | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/tools/dexpreopt/dexopt-wrapper/DexOptWrapper.cpp b/tools/dexpreopt/dexopt-wrapper/DexOptWrapper.cpp index fde2d08..102cf0e 100644 --- a/tools/dexpreopt/dexopt-wrapper/DexOptWrapper.cpp +++ b/tools/dexpreopt/dexopt-wrapper/DexOptWrapper.cpp @@ -115,7 +115,7 @@ int doStuff(const char* zipName, const char* odexName) exit(67); /* usually */ } else { /* parent -- wait for child to finish */ - printf("waiting for verify+opt, pid=%d\n", (int) pid); + printf("--- waiting for verify+opt, pid=%d\n", (int) pid); int status, oldStatus; pid_t gotPid; diff --git a/tools/dexpreopt/dexpreopt.py b/tools/dexpreopt/dexpreopt.py index 8a80e06..5dde642 100755 --- a/tools/dexpreopt/dexpreopt.py +++ b/tools/dexpreopt/dexpreopt.py @@ -95,9 +95,9 @@ def StartEmulator(exe_name='emulator', kernel=None, or unqualified (and left to exec() to find). kernel: If set, passed to the emulator as "-kernel". ramdisk: If set, passed to the emulator as "-ramdisk". - image: If set, passed to the emulator as "-image". + image: If set, passed to the emulator as "-system". userdata: If set, passed to the emulator as "-initdata" and "-data". - system: If set, passed to the emulator as "-system". + system: If set, passed to the emulator as "-sysdir". Returns: A subprocess.Popen that refers to the emulator process, or None if @@ -107,9 +107,10 @@ def StartEmulator(exe_name='emulator', kernel=None, args = [exe_name] if kernel: args += ['-kernel', kernel] if ramdisk: args += ['-ramdisk', ramdisk] - if image: args += ['-image', image] + if image: args += ['-system', image] if userdata: args += ['-initdata', userdata, '-data', userdata] - if system: args += ['-system', system] + if system: args += ['-sysdir', system] + args += ['-partition-size', '128'] args += ['-no-window', '-netfast', '-noaudio'] _USE_PIPE = True |