diff options
| author | 2015-12-09 16:20:34 +0000 | |
|---|---|---|
| committer | 2015-12-09 16:20:34 +0000 | |
| commit | f9a9f2bba730a4f47aa84d2b97d3f52f6a73ac1f (patch) | |
| tree | 5de62d223c08c0c2aecc8a9b350e0e2caa70b78c | |
| parent | 2c1164c2aea94e4dfc5bf21785557240c832bcd2 (diff) | |
| parent | 64fff41f639a7b85b2e172977175b3c79151634e (diff) | |
Merge "Clarify --boot-image help message"
| -rw-r--r-- | cmdline/cmdline.h | 1 | ||||
| -rw-r--r-- | dex2oat/dex2oat.cc | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/cmdline/cmdline.h b/cmdline/cmdline.h index 2e9f208309..4aced5b455 100644 --- a/cmdline/cmdline.h +++ b/cmdline/cmdline.h @@ -196,6 +196,7 @@ struct CmdlineArgs { " --boot-image=<file.art>: provide the image location for the boot class path.\n" " Do not include the arch as part of the name, it is added automatically.\n" " Example: --boot-image=/system/framework/boot.art\n" + " (specifies /system/framework/<arch>/boot.art as the image file)\n" "\n"; usage += StringPrintf( // Optional. " --instruction-set=(arm|arm64|mips|mips64|x86|x86_64): for locating the image\n" diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index a1485e4dd3..2aa4085fb1 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -215,7 +215,9 @@ NO_RETURN static void Usage(const char* fmt, ...) { UsageError(" Example: --base=0x50000000"); UsageError(""); UsageError(" --boot-image=<file.art>: provide the image file for the boot class path."); + UsageError(" Do not include the arch as part of the name, it is added automatically."); UsageError(" Example: --boot-image=/system/framework/boot.art"); + UsageError(" (specifies /system/framework/<arch>/boot.art as the image file)"); UsageError(" Default: $ANDROID_ROOT/system/framework/boot.art"); UsageError(""); UsageError(" --android-root=<path>: used to locate libraries for portable linking."); |