diff options
author | David 'Digit' Turner <digit@google.com> | 2009-10-07 14:59:58 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-07 14:59:58 -0700 |
commit | 6555d90a04dc8a43acb6e43d0b196c97758ffb69 (patch) | |
tree | d21b070b60b3ff1f57b3654eb7d6c79e527fd2bc /Makefile.android | |
parent | 1f2d8d3650062aa683aff2a42270724c1a4ba064 (diff) | |
parent | 2ec4559513cf475d499435444dffe8566c3aaaf3 (diff) | |
download | external_qemu-6555d90a04dc8a43acb6e43d0b196c97758ffb69.zip external_qemu-6555d90a04dc8a43acb6e43d0b196c97758ffb69.tar.gz external_qemu-6555d90a04dc8a43acb6e43d0b196c97758ffb69.tar.bz2 |
am 2ec45595: Fix the build.
Merge commit '2ec4559513cf475d499435444dffe8566c3aaaf3' into eclair-plus-aosp
* commit '2ec4559513cf475d499435444dffe8566c3aaaf3':
Fix the build.
Diffstat (limited to 'Makefile.android')
-rw-r--r-- | Makefile.android | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.android b/Makefile.android index 42104c2..982c0cd 100644 --- a/Makefile.android +++ b/Makefile.android @@ -643,12 +643,12 @@ LOCAL_GENERATED_SOURCES += $(QEMU_GDBSTUB_XML_C) # hw-config-defs.h is generated from android/avd/hardware-properties.ini # -QEMU_HARDWARE_PROPERTIES_INI := android/avd/hardware-properties.ini +QEMU_HARDWARE_PROPERTIES_INI := $(LOCAL_PATH)/android/avd/hardware-properties.ini QEMU_HW_CONFIG_DEFS_H := $(LOCAL_PATH)/android/avd/hw-config-defs.h $(QEMU_HW_CONFIG_DEFS_H): PRIVATE_PATH := $(LOCAL_PATH) -$(QEMU_HW_CONFIG_DEFS_H): PRIVATE_SOURCES := $(LOCAL_PATH)/$(QEMU_HARDWARE_PROPERTIES_INI) -$(QEMU_HW_CONFIG_DEFS_H): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PATH)/android/tools/gen-hw-config.py $(LOCAL_PATH)/$(QEMU_HARDWARE_PROPERTIES_INI) $@ -$(QEMU_HW_CONFIG_DEFS_H): $(LOCAL_PATH)/$(QEMU_HARDWARE_PROPERTIES_INI) $(LOCAL_PATH)/android/tools/gen-hw-config.py +$(QEMU_HW_CONFIG_DEFS_H): PRIVATE_SOURCES := $(QEMU_HARDWARE_PROPERTIES_INI) +$(QEMU_HW_CONFIG_DEFS_H): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PATH)/android/tools/gen-hw-config.py $(QEMU_HARDWARE_PROPERTIES_INI) $@ +$(QEMU_HW_CONFIG_DEFS_H): $(QEMU_HARDWARE_PROPERTIES_INI) $(LOCAL_PATH)/android/tools/gen-hw-config.py $(hide) rm -f $@ $(transform-generated-source) |