| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Change-id: Ibce845d0
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
Card emulation - DO NOT MERGE" into eclair
Merge commit '720b75ff159c33b0e939a0b1d67c7d103443b57c'
* commit '720b75ff159c33b0e939a0b1d67c7d103443b57c':
Revert previous patch to fix SD Card emulation - DO NOT MERGE
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
MERGE" into eclair
Merge commit '6c77585b906e7eedb878f39870c2b9757bcdd74c' into eclair-plus-aosp
* commit '6c77585b906e7eedb878f39870c2b9757bcdd74c':
Revert previous patch to fix SD Card emulation - DO NOT MERGE
|
| | |\
| | | |
| | | |
| | | | |
eclair
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The previous patch modifies SD Card hardware emulation in a way that is
not backwards compatible with previous SDK platform releases. This has
the unfortunate effect of making SD Card emulation not work properly
when running existing AVDs.
Reverting the patch until we get a better one. This change is intended
for the eclair branch only.
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge commit '30749bc2c008fd515643b222d04bdf2e1b943e44'
* commit '30749bc2c008fd515643b222d04bdf2e1b943e44':
android-2.1_r1 snapshot
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge commit '09be40754c824faece056e79e8dc60db10c4ef16' into eclair-plus-aosp
* commit '09be40754c824faece056e79e8dc60db10c4ef16':
android-2.1_r1 snapshot
|
| | |\ \
| | | |/
| | |/| |
|
| | | |\ |
|
| | | | | |
|
|\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge commit 'd9b8b90d6ea878ddb89c0f9affeb2b52767cdbd9'
* commit 'd9b8b90d6ea878ddb89c0f9affeb2b52767cdbd9':
Force gcc-4.0 for qemu build on Mac OS X
|
| |\ \ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The Android build of qemu forces SDK 10.4, but doesn't specify a GCC
version. This works fine for Mac OS X 10.4 - 10.5, but fails for 10.6.
Change-Id: Id241a12ddc3fbf100cd15a0e93e6d61b4aecb3fd
|
|\ \ \ \ \ \
| |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
FreeBSD in the standalone build system.
Merge commit '0edf6fb41b2ec38a3214d7a724cae70329b058b1'
* commit '0edf6fb41b2ec38a3214d7a724cae70329b058b1':
Add new -sdcard2 <file> option.
|
| |\ \ \ \ \
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
standalone build system.
Merge commit '1cb37b34f117f72bb16de23f42ba6885e729d85c' into eclair-plus-aosp
* commit '1cb37b34f117f72bb16de23f42ba6885e729d85c':
Add new -sdcard2 <file> option.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Add support for FreeBSD in the standalone build system.
|
|\ \ \ \ \ \
| |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
system for C++ sources.
Merge commit '538b01383c3f202aa7822ab9cae01c4d1abe2c08'
* commit '538b01383c3f202aa7822ab9cae01c4d1abe2c08':
Add support to the emulator's standalone build system for C++ sources.
|
| |\ \ \ \ \
| | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
sources.
Merge commit 'c973b058ebe38bb585a9a6026e39519db1f91c33' into eclair-plus-aosp
* commit 'c973b058ebe38bb585a9a6026e39519db1f91c33':
Add support to the emulator's standalone build system for C++ sources.
|
| | | |/ /
| | |/| | |
|
|\ \ \ \ \
| |/ / / / |
|
| |\ \ \ \
| | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
skin files.
Merge commit '39fd8497a66aa9f78a18c8684181128361612c6f' into eclair-plus-aosp
* commit '39fd8497a66aa9f78a18c8684181128361612c6f':
Add two documentation files describing the format of config and skin files.
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
revision.
Merge commit 'a383d02cb57dd7dadd382654175e51354073a139' into eclair-plus-aosp
* commit 'a383d02cb57dd7dadd382654175e51354073a139':
Extract emulator major version number from SDK Tools package revision.
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Merge commit '8b657e5deaa03b989b0b36791fcf2aa6b2882656' into eclair-plus-aosp
* commit '8b657e5deaa03b989b0b36791fcf2aa6b2882656':
Fix a crash when using an 8MB SD Card image file.
|
| |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Merge commit '5bc6182ae984796a6d14be7f7b8eb73c1b630b8e' into eclair-plus-aosp
* commit '5bc6182ae984796a6d14be7f7b8eb73c1b630b8e':
Fix location of prebuilt skins.
|
|\ \ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
describing the format of config and skin files.
Merge commit '7e7e1732e0db91e137356fe94951e73ab7219cbd'
* commit '7e7e1732e0db91e137356fe94951e73ab7219cbd':
Add two documentation files describing the format of config and skin files.
|
| |\ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
of config and skin files.
Merge commit 'e3c94626074fd1331d1821fed5db043f6da02d2a' into eclair-mr2-plus-aosp
* commit 'e3c94626074fd1331d1821fed5db043f6da02d2a':
Add two documentation files describing the format of config and skin files.
|
| | |\ \ \ \ \ \ \ \
| | | | |_|_|_|/ / /
| | | |/| | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
skin files.
Merge commit '39fd8497a66aa9f78a18c8684181128361612c6f' into eclair-mr2
* commit '39fd8497a66aa9f78a18c8684181128361612c6f':
Add two documentation files describing the format of config and skin files.
|
| | | | |_|_|/ / /
| | | |/| | | | | |
|
|\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
managing sdcards
Merge commit '0bf9b8b2e1e625ce427911deb3732ff67a58a8e3'
* commit '0bf9b8b2e1e625ce427911deb3732ff67a58a8e3':
qemu: android: Add control console support for managing sdcards
|
| |\ \ \ \ \ \ \ \
| | |/ / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Merge commit '71e736ef90ef644130201742980b275fcca259a5' into eclair-mr2-plus-aosp
* commit '71e736ef90ef644130201742980b275fcca259a5':
qemu: android: Add control console support for managing sdcards
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Signed-off-by: San Mehat <san@google.com>
qemu: goldfish: Fix compile error introduced in refactoring
Signed-off-by: San Mehat <san@google.com>
|
|\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
well as swapping image files
Merge commit '76ae1ea0e8ef78573df59d0ff4b990bf564920db'
* commit '76ae1ea0e8ef78573df59d0ff4b990bf564920db':
qemu: android: Add support for hot-adding disks as well as swapping image files
|
| |\ \ \ \ \ \ \ \
| | |/ / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
swapping image files
Merge commit '7ab6d35b98bc279a5fcd36965433a51a3c9aecd9' into eclair-mr2-plus-aosp
* commit '7ab6d35b98bc279a5fcd36965433a51a3c9aecd9':
qemu: android: Add support for hot-adding disks as well as swapping image files
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Signed-off-by: San Mehat <san@google.com>
|
|\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Merge commit 'b3e7ebed293cb3dbfbaafc888aff0349e069e820'
* commit 'b3e7ebed293cb3dbfbaafc888aff0349e069e820':
qemu: android: Add support for multiple SD cards
|
| |\ \ \ \ \ \ \ \
| | |/ / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Merge commit '68a8f7b5ed6ee2bbbc7b67070b9c401c2276426f' into eclair-mr2-plus-aosp
* commit '68a8f7b5ed6ee2bbbc7b67070b9c401c2276426f':
qemu: android: Add support for multiple SD cards
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Add commandline support for an additional SD card, and plumb support to
the MMC emulation layer. This patch also reworks the way the hw emulation
layer registers devices. Previously, the mmc virtual hardware was only
created if the sdcard image existed. Now, two virtual MMC controllers are
*always* created as on real hardware. When a request is made to one
of our controllers which has no image file bound to it, a new interrupt
status indicating a command timeout is sent to the guest driver, as
is standard with MMC controllers. This patch also sets the stage for
supporting hot-add / hot-remove.
Signed-off-by: San Mehat <san@google.com>
qemu: android: Integrate card detect into the virtual mmc hardware and
wire it up to the STATE_CHANGE irq status
Signed-off-by: San Mehat <san@google.com>
fixups from review - mmc now works with legacy
drivers
Signed-off-by: San Mehat <san@google.com>
|
|\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
from SDK Tools package revision.
Merge commit '51e8424b90a592619034f13b162cb5f6d0fee3d0'
* commit '51e8424b90a592619034f13b162cb5f6d0fee3d0':
Extract emulator major version number from SDK Tools package revision.
|
| |\ \ \ \ \ \ \ \
| | |/ / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Tools package revision.
Merge commit 'dc3dd741551c323bb853782656c0d693db98ecdc' into eclair-mr2-plus-aosp
* commit 'dc3dd741551c323bb853782656c0d693db98ecdc':
Extract emulator major version number from SDK Tools package revision.
|
| | |\ \ \ \ \ \ \
| | | |/ / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
revision.
Merge commit 'a383d02cb57dd7dadd382654175e51354073a139' into eclair-mr2
* commit 'a383d02cb57dd7dadd382654175e51354073a139':
Extract emulator major version number from SDK Tools package revision.
|
| | | | |_|/ / /
| | | |/| | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The minor version number is now always 0, this makes the next
version number "5.0" currently in the eclair branch.
|
|\ \ \ \ \ \ \ \
| |/ / / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
image file.
Merge commit 'ae4812d7514dbea69f72da2386c573b63f54160b'
* commit 'ae4812d7514dbea69f72da2386c573b63f54160b':
Fix a crash when using an 8MB SD Card image file.
|
| |\ \ \ \ \ \ \
| | |/ / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Merge commit '1c657d4855986fcf9f4df2b592b1d0ca3238defc' into eclair-mr2-plus-aosp
* commit '1c657d4855986fcf9f4df2b592b1d0ca3238defc':
Fix a crash when using an 8MB SD Card image file.
|
| | |\ \ \ \ \ \
| | | |/ / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Merge commit '8b657e5deaa03b989b0b36791fcf2aa6b2882656' into eclair-mr2
* commit '8b657e5deaa03b989b0b36791fcf2aa6b2882656':
Fix a crash when using an 8MB SD Card image file.
|
| | | | |/ / /
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | | |
The minimum size is now 9MB. This appears to be a limitation
of the emulated MMC hardware code and/or kernel device driver.
|
|\ \ \ \ \ \ \
| |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Merge commit '0152329883ccb02e9b8afedbe04ccc3519ab421a'
* commit '0152329883ccb02e9b8afedbe04ccc3519ab421a':
Fix location of prebuilt skins.
|
| |\ \ \ \ \ \
| | |/ / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Merge commit '70dc4cbc6e6b6b1813d3f0d548b6ab3c381ccbd5' into eclair-mr2-plus-aosp
* commit '70dc4cbc6e6b6b1813d3f0d548b6ab3c381ccbd5':
Fix location of prebuilt skins.
|
| | |\ \ \ \ \
| | | |/ / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Merge commit '5bc6182ae984796a6d14be7f7b8eb73c1b630b8e' into eclair-mr2
* commit '5bc6182ae984796a6d14be7f7b8eb73c1b630b8e':
Fix location of prebuilt skins.
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Change-Id: I3ce440cff624138518dc410c304353bea1ecef91
|
|\ \ \ \ \ \ \
| |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Merge commit 'abe0c58f33f70141c46092052e62531622362429'
* commit 'abe0c58f33f70141c46092052e62531622362429':
eclair snapshot
|