diff options
| author | Raphael Moll <ralf@android.com> | 2010-08-21 17:59:12 -0700 |
|---|---|---|
| committer | Raphael Moll <ralf@android.com> | 2010-08-21 22:42:43 -0700 |
| commit | 0ddce47c639201891296b449676baa2705bbfd72 (patch) | |
| tree | 9090497c29dd22731ed8c184ec155168fd3d674a /sdklauncher/Android.mk | |
| parent | 1d58e4de785b1ef9ae3b38568a6995d0bed9ee06 (diff) | |
| download | sdk-0ddce47c639201891296b449676baa2705bbfd72.zip sdk-0ddce47c639201891296b449676baa2705bbfd72.tar.gz sdk-0ddce47c639201891296b449676baa2705bbfd72.tar.bz2 | |
SDK Launcher: add win32 app manifest
Change-Id: Iac3ad3d28d62c67b15b75346a56c2194f1837096
Diffstat (limited to 'sdklauncher/Android.mk')
| -rw-r--r-- | sdklauncher/Android.mk | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sdklauncher/Android.mk b/sdklauncher/Android.mk index e3cc7d3..8f0141b 100644 --- a/sdklauncher/Android.mk +++ b/sdklauncher/Android.mk @@ -28,20 +28,21 @@ ifneq ($(USE_MINGW),) endif # Link the Windows icon file as well into the executable, based on the technique -# used in external/qemu/Makefile.android. +# used in external/qemu/Makefile.android. The variables need to have different +# names to not interfere with the ones from qemu/Makefile.android. # INTERMEDIATE := $(call intermediates-dir-for,EXECUTABLES,$(LOCAL_MODULE),true) -ANDROID_ICON_OBJ := android_icon.o -ANDROID_ICON_PATH := $(LOCAL_PATH)/images -$(ANDROID_ICON_PATH)/$(ANDROID_ICON_OBJ): $(ANDROID_ICON_PATH)/android_icon.rc - $(WINDRES) $< -I $(ANDROID_ICON_PATH) -o $@ +SDKLAUNCHER_ICON_OBJ := sdklauncher_icon.o +SDKLAUNCHER_ICON_PATH := $(LOCAL_PATH)/images +$(SDKLAUNCHER_ICON_PATH)/$(SDKLAUNCHER_ICON_OBJ): $(SDKLAUNCHER_ICON_PATH)/android_icon.rc + $(WINDRES) $< -I $(SDKLAUNCHER_ICON_PATH) -o $@ # seems to be the only way to add an object file that was not generated from # a C/C++/Java source file to our build system. and very unfortunately, # $(TOPDIR)/$(LOCALPATH) will always be prepended to this value, which forces # us to put the object file in the source directory... # -LOCAL_PREBUILT_OBJ_FILES += images/$(ANDROID_ICON_OBJ) +LOCAL_PREBUILT_OBJ_FILES += images/$(SDKLAUNCHER_ICON_OBJ) include $(BUILD_HOST_EXECUTABLE) |