diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-06-29 13:16:16 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2011-07-05 23:32:43 +0200 |
| commit | 42fc4496541acdcaf49bcdf3fcffe247be985fe0 (patch) | |
| tree | 5fcf6de41dd6b6ea1d6d829b0f0add93dd4fc127 /Makefile.target | |
| parent | 83c8f4e018e6a5e149c7836a388854255b81617f (diff) | |
| download | external_qemu-42fc4496541acdcaf49bcdf3fcffe247be985fe0.zip external_qemu-42fc4496541acdcaf49bcdf3fcffe247be985fe0.tar.gz external_qemu-42fc4496541acdcaf49bcdf3fcffe247be985fe0.tar.bz2 | |
hw-config-defs.h: Remove from source tree + auto-generate
This patch modifies the emulator's build system to place the
auto-generated file android/avd/hw-config-defs.h into the build
directory. Before that, the file was placed in the source tree.
+ Fix the standalone build system to properly deal with
generated source file dependencies + LOCAL_C_INCLUDES
Change-Id: I4e77cd20bf4ca21f79d5dd19f27724bd8be53a79
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.target b/Makefile.target index 5f7a8b2..ccc86b4 100644 --- a/Makefile.target +++ b/Makefile.target @@ -86,6 +86,8 @@ HW_SOURCES := \ usb.c \ watchdog.c +$(call gen-hw-config-defs) + ifeq ($(EMULATOR_TARGET_ARCH),arm) HW_SOURCES += android_arm.c \ arm_pic.c \ @@ -277,6 +279,7 @@ LOCAL_SRC_FILES := \ $(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 qemu-options.h) +$(call gen-hw-config-defs) ifeq ($(HOST_OS),darwin) FRAMEWORKS := OpenGL Cocoa QuickTime ApplicationServices Carbon IOKit @@ -356,6 +359,7 @@ LOCAL_SRC_FILES := \ $(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 qemu-options.h) +$(call gen-hw-config-defs) # The following files cannot be in static libraries because they contain # constructor functions that are otherwise stripped by the final linker |