Merge pull request #2419 from redorav/fix-arch-regression

Remove the 'Android' architecture from pre-vs2015 support
premake · Jan 17, 2025 · da8cacd · da8cacd
2 parents 07896b9 + f2d9045
commit da8cacd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/modules/vstudio/tests/android/test_android_project.lua b/modules/vstudio/tests/android/test_android_project.lua
@@ -157,7 +157,7 @@
 		externalincludedirs { "externalincludedirs" }
 		prepareOutputProperties()
 		test.capture [[
-<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Android'">
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
 	<IntDir>obj\Debug\</IntDir>
 	<TargetName>MyProject</TargetName>
 	<TargetExt>

diff --git a/modules/vstudio/vstudio.lua b/modules/vstudio/vstudio.lua
@@ -36,10 +36,6 @@
 		win32   = "x86",
 	}
 
-	if _ACTION < "vs2015" then
-		vstudio.vs2010_architectures.android = "Android"
-	end
-
 	local function architecture(system, arch)
 		local result
 		if _ACTION >= "vs2010" then