aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.target
diff options
context:
space:
mode:
authorRaphael Moll <ralf@android.com>2012-05-04 15:04:27 -0700
committerRaphael Moll <ralf@android.com>2012-05-04 15:24:01 -0700
commitcdbea233d20daa19ce1d43da32e8154a7a2aca33 (patch)
tree831c9edba45480a76db7d579c2dd1e5e7fb392c5 /Makefile.target
parentb868827a61162e0345537b293b92a96e3784d516 (diff)
downloadexternal_qemu-cdbea233d20daa19ce1d43da32e8154a7a2aca33.zip
external_qemu-cdbea233d20daa19ce1d43da32e8154a7a2aca33.tar.gz
external_qemu-cdbea233d20daa19ce1d43da32e8154a7a2aca33.tar.bz2
Win SDK: Fix missing emulator icon
History: It had been inadvertedly removed by the makefile reorg done in aff94b88c4ec057f20950d5e7a88b90cc4d97dce. SDK Bug: 21709 Change-Id: Icd147a1edb363e1ccbee2c3cade4ed34beceeeff
Diffstat (limited to 'Makefile.target')
-rw-r--r--Makefile.target6
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile.target b/Makefile.target
index e8a41f4..5b4ec5f 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -432,6 +432,11 @@ LOCAL_SRC_FILES += $(common_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),windows)
+$(eval $(call insert-windows-icon))
+endif
+
$(call end-emulator-program)
@@ -455,3 +460,4 @@ ifeq ($(HOST_OS),linux)
$(call end-emulator-program)
endif # BUILD_STANDALONE_EMULATOR == nil
endif # HOST_OS == linux
+