diff options
Diffstat (limited to 'android')
| -rw-r--r-- | android/android.h | 3 | ||||
| -rw-r--r-- | android/avd/info.c | 2 | ||||
| -rw-r--r-- | android/help.c | 2 | ||||
| -rw-r--r-- | android/main.c | 13 | ||||
| -rw-r--r-- | android/utils/ini.h | 32 |
5 files changed, 13 insertions, 39 deletions
diff --git a/android/android.h b/android/android.h index 6d092fd..ca6cfaf 100644 --- a/android/android.h +++ b/android/android.h @@ -12,9 +12,6 @@ #ifndef _qemu_android_h #define _qemu_android_h -#define ANDROID_VERSION_MAJOR 1 -#define ANDROID_VERSION_MINOR 12 - #define CONFIG_SHAPER 1 #include <stdlib.h> diff --git a/android/avd/info.c b/android/avd/info.c index 10e2005..e738065 100644 --- a/android/avd/info.c +++ b/android/avd/info.c @@ -1279,7 +1279,7 @@ _getBuildSkin( AvdInfo* i, AvdInfoParams* params ) if (!skinDir) { -#define PREBUILT_SKINS_DIR "development/emulator/skins" +#define PREBUILT_SKINS_DIR "sdk/emulator/skins" do { /* try in <sysdir>/../skins first */ diff --git a/android/help.c b/android/help.c index 50c9d02..a142f9d 100644 --- a/android/help.c +++ b/android/help.c @@ -116,7 +116,7 @@ help_build_images( stralloc_t* out ) " If the kernel image is not found in the out directory, then it is searched\n" " in <build-root>/prebuilt/android-arm/kernel/.\n\n" - " Skins will be looked in <build-root>/development/emulator/skins/\n\n" + " Skins will be looked in <build-root>/sdk/emulator/skins/\n\n" " You can use the -sysdir, -system, -kernel, -ramdisk, -datadir, -data options\n" " to specify different search directories or specific image files. You can\n" diff --git a/android/main.c b/android/main.c index 7b20919..e791efe 100644 --- a/android/main.c +++ b/android/main.c @@ -76,7 +76,11 @@ AndroidRotation android_framebuffer_rotation; #define STRINGIFY(x) _STRINGIFY(x) #define _STRINGIFY(x) #x -#define VERSION_STRING STRINGIFY(ANDROID_VERSION_MAJOR)"."STRINGIFY(ANDROID_VERSION_MINOR) +#ifdef ANDROID_SDK_TOOLS_REVISION +# define VERSION_STRING STRINGIFY(ANDROID_SDK_TOOLS_REVISION)".0" +#else +# define VERSION_STRING "standalone" +#endif #define KEYSET_FILE "default.keyset" SkinKeyset* android_keyset; @@ -2478,8 +2482,11 @@ int main(int argc, char **argv) uint64_t size; if (path_get_size(opts->sdcard, &size) == 0) { /* see if we have an sdcard image. get its size if it exists */ - if (size < 8*1024*1024ULL) { - fprintf(stderr, "### WARNING: SD Card files must be at least 8 MB, ignoring '%s'\n", opts->sdcard); + /* due to what looks like limitations of the MMC protocol, one has + * to use an SD Card image that is equal or larger than 9 MB + */ + if (size < 9*1024*1024ULL) { + fprintf(stderr, "### WARNING: SD Card files must be at least 9MB, ignoring '%s'\n", opts->sdcard); } else { args[n++] = "-hda"; args[n++] = opts->sdcard; diff --git a/android/utils/ini.h b/android/utils/ini.h index a176bfe..83d2027 100644 --- a/android/utils/ini.h +++ b/android/utils/ini.h @@ -15,37 +15,7 @@ #include <stdint.h> /* the emulator supports a simple .ini file format for its configuration - * files. Here's the BNF for it: - * - * file := <line>* - * line := <comment> | <LF> | <assignment> - * comment := (';'|'#') <noLF>* <LF> - * assignment := <space>* <keyName> <space>* '=' <space>* <valueString> <space>* <LF> - * keyName := <keyNameStartChar> <keyNameChar>* - * keyNameStartChar := [A-Za-z_] - * keyNameChar := [A-Za-z0-9_.-] - * valueString := <noLF>* - * space := ' ' | '\t' - * LF := '\r\n' | '\n' | '\r' - * noLF := [^<LF>] - * - * Or, in English: - * - * - no support for sections - * - empty lines are ignored, as well as lines beginning with ';' or '#' - * - lines must be of the form: "<keyName> = <value>" - * - key names must start with a letter or an underscore - * - other key name characters can be letters, digits, underscores, dots or dashes - * - * - leading and trailing space are allowed and ignored before/after the key name - * and before/after the value - * - * - there is no restriction on the value, except that it can't contain - * leading/trailing space/tab characters or newline/charfeed characters - * - * - empty values are possible, and will be stored as an empty string. - * - any badly formatted line is discarded (and will print a warning) - * + * files. See docs/ANDROID-CONFIG-FILES.TXT for details. */ /* an opaque structure used to model an .ini configuration file */ |