diff options
| author | David Turner <digit@android.com> | 2010-09-09 22:54:36 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2010-09-13 00:30:34 -0700 |
| commit | 6a9ef1773bf874dea493ff3861782a1e577b67dd (patch) | |
| tree | 18cb2addd19195710b8860077ed9bfbef8ad44a5 /Makefile.android | |
| parent | 0c0b2b4e96b030854987b16a779e30a3741d3b0d (diff) | |
| download | external_qemu-6a9ef1773bf874dea493ff3861782a1e577b67dd.zip external_qemu-6a9ef1773bf874dea493ff3861782a1e577b67dd.tar.gz external_qemu-6a9ef1773bf874dea493ff3861782a1e577b67dd.tar.bz2 | |
upstream: move timer management code to qemu-timer.c
Diffstat (limited to 'Makefile.android')
| -rw-r--r-- | Makefile.android | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.android b/Makefile.android index 8692115..a7006b8 100644 --- a/Makefile.android +++ b/Makefile.android @@ -130,7 +130,7 @@ endif TCG_CFLAGS := -I$(LOCAL_PATH)/tcg -I$(LOCAL_PATH)/tcg/$(TCG_TARGET) -LOCAL_CFLAGS += $(TCG_CFLAGS) \ +LOCAL_CFLAGS += $(TCG_CFLAGS) -DNEED_CPU_H \ -I$(LOCAL_PATH)/target-arm \ -I$(LOCAL_PATH)/fpu \ @@ -151,7 +151,7 @@ LOCAL_MODULE := emulator-hw HW_CFLAGS := -I$(LOCAL_PATH)/hw -LOCAL_CFLAGS := $(MY_CFLAGS) $(LOCAL_CFLAGS) +LOCAL_CFLAGS := $(MY_CFLAGS) $(LOCAL_CFLAGS) -DNEED_CPU_H LOCAL_CFLAGS += -I$(LOCAL_PATH)/target-arm -I$(LOCAL_PATH)/fpu $(HW_CFLAGS) LOCAL_CFLAGS += $(ZLIB_CFLAGS) -I$(LOCAL_PATH)/$(ZLIB_DIR) @@ -248,7 +248,7 @@ LOCAL_MODULE := emulator-memcheck MCHK_CFLAGS := -I$(LOCAL_PATH)/memcheck -I$(LOCAL_PATH)/elff -LOCAL_CFLAGS := $(MY_CFLAGS) $(LOCAL_CFLAGS) +LOCAL_CFLAGS := $(MY_CFLAGS) $(LOCAL_CFLAGS) -DNEED_CPU_H LOCAL_CFLAGS += -I$(LOCAL_PATH)/target-arm -I$(LOCAL_PATH)/fpu $(MCHK_CFLAGS) LOCAL_CFLAGS += $(ZLIB_CFLAGS) -I$(LOCAL_PATH)/$(ZLIB_DIR) @@ -283,6 +283,7 @@ LOCAL_CFLAGS += -I$(LOCAL_PATH) \ -I$(LOCAL_PATH)/fpu \ $(TCG_CFLAGS) \ $(HW_CFLAGS) \ + -DNEED_CPU_H \ ifeq ($(HOST_ARCH),ppc) LOCAL_CFLAGS += -D__powerpc__ @@ -655,6 +656,7 @@ CORE_MISC_SOURCES = vl-android.c \ bt-host.c \ bt-vhci.c \ module.c \ + qemu-timer.c \ android/boot-properties.c \ android/display.c \ android/hw-kmsg.c \ |