diff options
| author | David 'Digit' Turner <digit@android.com> | 2010-12-23 02:54:08 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2011-01-02 22:31:27 +0100 |
| commit | cb42a1b1461e02efb034582ac5d8f71534723b92 (patch) | |
| tree | 5dbd619671d4591d33834488f1c15690dabf50ba /Makefile.android | |
| parent | ca6a2e034bce665a08d9d748ac11d6a7cfcd7c48 (diff) | |
| download | external_qemu-cb42a1b1461e02efb034582ac5d8f71534723b92.zip external_qemu-cb42a1b1461e02efb034582ac5d8f71534723b92.tar.gz external_qemu-cb42a1b1461e02efb034582ac5d8f71534723b92.tar.bz2 | |
upstream: integrate block changes
This large patch upgrades the block support code to the upstream
version available in ba5e7f82169f32ab8163c707d97c799ca09f8924
dated 2010-08-08
Change-Id: I8b24df0c287e72f6620650a4d6a62e1bb315453e
Diffstat (limited to 'Makefile.android')
| -rw-r--r-- | Makefile.android | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Makefile.android b/Makefile.android index c995f27..271fc49 100644 --- a/Makefile.android +++ b/Makefile.android @@ -518,6 +518,11 @@ EMULATOR_CORE_CFLAGS += -I$(LOCAL_PATH)/ \ $(TCG_CFLAGS) \ $(HW_CFLAGS) \ +# Required by block.c, default value is empty in upstream +EMULATOR_CORE_CFLAGS += -DCONFIG_BDRV_WHITELIST="" + +# Required +EMULATOR_CORE_CFLAGS += -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1 # include slirp-android code, i.e. the user-level networking stuff # SLIRP_SOURCES := bootp.c cksum.c debug.c if.c ip_icmp.c ip_input.c ip_output.c \ @@ -609,6 +614,7 @@ include $(BUILD_HOST_STATIC_LIBRARY) # block sources # CORE_BLOCK_SOURCES = block.c \ + blockdev.c \ block/qcow.c \ block/qcow2.c \ block/qcow2-refcount.c \ @@ -616,7 +622,8 @@ CORE_BLOCK_SOURCES = block.c \ block/qcow2-cluster.c \ block/cloop.c \ block/dmg.c \ - block/vvfat.c + block/vvfat.c \ + block/raw.c ifeq ($(HOST_OS),windows) CORE_BLOCK_SOURCES += block/raw-win32.c else @@ -715,6 +722,8 @@ endif ifeq ($(HOST_OS),windows) CORE_MISC_SOURCES += tap-win32.c +else + CORE_MISC_SOURCES += posix-aio-compat.c endif # sources inherited from upstream, but not fully |