SDK Launcher: add win32 app manifest

Merged from master to tools_r7

Change-Id: Ic9b8d265868b0e062fce067312c9e9fa89bba3c7

4 files changed, 42 insertions, 9 deletions

diff --git a/sdklauncher/.gitignore b/sdklauncher/.gitignore
index 0c25b2a..1721bc7 100644
--- a/sdklauncher/.gitignore
+++ b/sdklauncher/.gitignore
@@ -1 +1 @@
-images/android_icon.o
+images/sdklauncher_icon.o
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)
 
diff --git a/sdklauncher/images/android_icon.rc b/sdklauncher/images/android_icon.rc
index df468ac..25c904c 100644
--- a/sdklauncher/images/android_icon.rc
+++ b/sdklauncher/images/android_icon.rc
@@ -1,3 +1,2 @@
 1 ICON "../images/android_icon.ico"

-

-

+1 RT_MANIFEST "../sdklauncher.exe.manifest"

diff --git a/sdklauncher/sdklauncher.exe.manifest b/sdklauncher/sdklauncher.exe.manifest
new file mode 100755
index 0000000..dc286ae
--- /dev/null
+++ b/sdklauncher/sdklauncher.exe.manifest
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

+

+<!--

+  For details on the Assembly Manifest, please look here:

+  http://msdn.microsoft.com/en-us/library/aa374191(VS.85).aspx

+-->

+

+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 

+

+    <application>

+        <!--The ID below indicates application support for Windows Vista -->

+        <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />

+        <!--The ID below indicates application support for Windows 7 -->

+        <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />

+    </application>

+  

+    <assemblyIdentity version="1.0.0.0"

+        processorArchitecture="x86"

+        name="Android.SDK.Launcher"

+        type="win32"

+        /> 

+

+    <description>Launches the Android SDK Manager to download Android SDK packages.</description> 

+

+    <!-- Identify the application security requirements. -->

+    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">

+        <security>

+            <requestedPrivileges>

+                <requestedExecutionLevel level="asInvoker" uiAccess="false" />

+            </requestedPrivileges>

+        </security>

+    </trustInfo>

+</assembly>