fixing cmaketoolchain cross for Android
@@ -545,7 +545,8 @@ class GenericSystemBlock(Block):
arch_build = settings_build.get_safe("arch")
if system_name is None: # Try to deduce
- if os_ not in ('Macos', 'iOS', 'watchOS', 'tvOS'): # Handled by AppleBlock
+ # Handled by AppleBlock, or AndroidBlock, not here
+ if os_ not in ('Macos', 'iOS', 'watchOS', 'tvOS', 'Android'):
cmake_system_name_map = {"Neutrino": "QNX",
"": "Generic",
None: "Generic"}
@@ -558,8 +559,7 @@ class GenericSystemBlock(Block):
system_name = cmake_system_name_map.get(os_, os_)
if system_name is not None and system_version is None:
- os_ver_str = "os.api_level" if os_ == "Android" else "os.version"
- system_version = settings.get_safe(os_ver_str)
+ system_version = settings.get_safe("os.version")
if system_name is not None and system_processor is None:
if arch != arch_build:
