diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-05-10 06:38:21 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2011-06-01 17:08:17 +0200 |
| commit | 317c9d54284844615b33a25834a63248bf1bfa73 (patch) | |
| tree | e2b70541e870aaf9990db72050472ec3a7fc74fb /Makefile.target | |
| parent | 47dc1f4132ed3bafd2f564458288f9931ef0e0a4 (diff) | |
| download | external_qemu-317c9d54284844615b33a25834a63248bf1bfa73.zip external_qemu-317c9d54284844615b33a25834a63248bf1bfa73.tar.gz external_qemu-317c9d54284844615b33a25834a63248bf1bfa73.tar.bz2 | |
qemu-timer.c: upstream integrate
Change-Id: I6856ded73b4dcd10fe4831697c8518f958aeffbb
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.target b/Makefile.target index 0743987..6cf2283 100644 --- a/Makefile.target +++ b/Makefile.target @@ -132,8 +132,8 @@ endif LOCAL_SRC_FILES += $(HW_SOURCES:%=hw/%) LOCAL_SRC_FILES += \ - exec.c \ cpu-exec.c \ + exec.c \ translate-all.c \ trace.c \ varint.c \ @@ -256,6 +256,7 @@ LOCAL_SRC_FILES := \ loader.c \ monitor.c \ qemu-timer.c \ + qemu-timer-common.c \ user-events-qemu.c \ vl-android.c \ android/console.c \ @@ -268,7 +269,7 @@ LOCAL_SRC_FILES := \ android/protocol/core-commands-qemu.c \ $(call gen-hx-header,qemu-monitor.hx,qemu-monitor.h,monitor.c) -$(call gen-hx-header,qemu-options.hx,qemu-options.def,vl-android.c) +$(call gen-hx-header,qemu-options.hx,qemu-options.def,vl-android.c qemu-options.h) ifeq ($(HOST_OS),darwin) FRAMEWORKS := OpenGL Cocoa QuickTime ApplicationServices Carbon IOKit @@ -332,6 +333,7 @@ LOCAL_SRC_FILES := \ loader.c \ monitor.c \ qemu-timer.c \ + qemu-timer-common.c \ user-events-qemu.c \ vl-android.c \ android/cmdline-option.c \ @@ -346,7 +348,7 @@ LOCAL_SRC_FILES := \ android/ $(call gen-hx-header,qemu-monitor.hx,qemu-monitor.h,monitor.c) -$(call gen-hx-header,qemu-options.hx,qemu-options.def,vl-android.c) +$(call gen-hx-header,qemu-options.hx,qemu-options.def,vl-android.c qemu-options.h) # The following files cannot be in static libraries because they contain # constructor functions that are otherwise stripped by the final linker |