diff options
| author | Raphael Moll <ralf@android.com> | 2012-11-26 13:36:15 -0800 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-11-26 13:36:15 -0800 |
| commit | 69d33c68eab8a49867c2cd9618f0d3d380ab2857 (patch) | |
| tree | 9a59db5d12e688a936d8620f4a28548d190f8564 /find_java | |
| parent | 6a8afbef9e33a52728e5d19c7347cd073bc860cb (diff) | |
| parent | d5d08c0ab6c4a0228544f6839e33045cf9b43723 (diff) | |
| download | sdk-69d33c68eab8a49867c2cd9618f0d3d380ab2857.zip sdk-69d33c68eab8a49867c2cd9618f0d3d380ab2857.tar.gz sdk-69d33c68eab8a49867c2cd9618f0d3d380ab2857.tar.bz2 | |
Merge "SDK Launcher support sdk\tools\android.bat"
Diffstat (limited to 'find_java')
| -rwxr-xr-x | find_java/find_java.sln | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/find_java/find_java.sln b/find_java/find_java.sln index 17c3228..ec14173 100755 --- a/find_java/find_java.sln +++ b/find_java/find_java.sln @@ -7,16 +7,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FindJavaExe", "find_java_ex EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FindLock", "..\find_lock\find_lock_exe.vcproj", "{42701EC1-6226-47FD-8817-57A3DEC7A1E2}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SdkLauncher", "..\sdklauncher\sdklauncher.vcproj", "{331EADA4-DC19-429D-AAD0-5B9632B4CBC1}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {5E3E2AFD-1D6B-4997-A9B5-8ECBC8F6C31A}.Debug|Win32.ActiveCfg = Debug|Win32
- {5E3E2AFD-1D6B-4997-A9B5-8ECBC8F6C31A}.Debug|Win32.Build.0 = Debug|Win32
- {5E3E2AFD-1D6B-4997-A9B5-8ECBC8F6C31A}.Release|Win32.ActiveCfg = Release|Win32
- {5E3E2AFD-1D6B-4997-A9B5-8ECBC8F6C31A}.Release|Win32.Build.0 = Release|Win32
{D194C98B-3FA4-4DAB-908A-16C03C15EC35}.Debug|Win32.ActiveCfg = Debug|Win32
{D194C98B-3FA4-4DAB-908A-16C03C15EC35}.Debug|Win32.Build.0 = Debug|Win32
{D194C98B-3FA4-4DAB-908A-16C03C15EC35}.Release|Win32.ActiveCfg = Release|Win32
@@ -29,6 +27,10 @@ Global {42701EC1-6226-47FD-8817-57A3DEC7A1E2}.Debug|Win32.Build.0 = Debug|Win32
{42701EC1-6226-47FD-8817-57A3DEC7A1E2}.Release|Win32.ActiveCfg = Release|Win32
{42701EC1-6226-47FD-8817-57A3DEC7A1E2}.Release|Win32.Build.0 = Release|Win32
+ {331EADA4-DC19-429D-AAD0-5B9632B4CBC1}.Debug|Win32.ActiveCfg = Debug|Win32
+ {331EADA4-DC19-429D-AAD0-5B9632B4CBC1}.Debug|Win32.Build.0 = Debug|Win32
+ {331EADA4-DC19-429D-AAD0-5B9632B4CBC1}.Release|Win32.ActiveCfg = Release|Win32
+ {331EADA4-DC19-429D-AAD0-5B9632B4CBC1}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
|