aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.android
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-05-10 06:38:21 +0200
committerDavid 'Digit' Turner <digit@android.com>2011-06-01 17:08:17 +0200
commit317c9d54284844615b33a25834a63248bf1bfa73 (patch)
treee2b70541e870aaf9990db72050472ec3a7fc74fb /Makefile.android
parent47dc1f4132ed3bafd2f564458288f9931ef0e0a4 (diff)
downloadexternal_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.android')
-rw-r--r--Makefile.android6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.android b/Makefile.android
index ed8a965..4139226 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -148,18 +148,18 @@ start-emulator-library = \
$(eval LOCAL_AR := $(MY_AR)) \
$(eval LOCAL_LDLIBS := $(MY_LDLIBS)) \
$(eval LOCAL_MODULE_TAGS := debug) \
- $(eval LOCAL_MODULE := $1)
+ $(eval LOCAL_MODULE := $1) \
# Used with start-emulator-library
end-emulator-library = \
$(eval include $(BUILD_HOST_STATIC_LIBRARY)) \
- $(eval EMULATOR_MODULE_TYPE := HOST_STATIC_LIBRARY)
+ $(eval EMULATOR_MODULE_TYPE := STATIC_LIBRARY)
# A variant of start-emulator-library to start the definition of a host
# program instead. Use with end-emulator-program
start-emulator-program = \
$(call start-emulator-library,$1) \
- $(eval EMULATOR_MODULE_TYPE := HOST_EXECUTABLES)
+ $(eval EMULATOR_MODULE_TYPE := EXECUTABLES)
# A varient of end-emulator-library for host programs instead
end-emulator-program = \