Fix tests for icu and try a fix for openal

Author: misl6

pythonforandroid/recipes/openal/__init__.py

@@ -6,7 +6,7 @@
 
 
 class OpenALRecipe(NDKRecipe):
-    version = '1.18.2'
+    version = '1.21.1'
     url = 'https://github.com/kcat/openal-soft/archive/openal-soft-{version}.tar.gz'
 
     generated_libraries = ['libopenal.so']
@@ -21,7 +21,10 @@ def build_arch(self, arch):
         with current_directory(self.get_build_dir(arch.arch)):
             env = self.get_recipe_env(arch)
             cmake_args = [
-                '-DCMAKE_TOOLCHAIN_FILE={}'.format('XCompile-Android.txt'),
+                "-DANDROID_STL=" + self.stl_lib_name,
+                "-DCMAKE_TOOLCHAIN_FILE={}".format(
+                    join(self.ctx.ndk_dir, "build", "cmake", "android.toolchain.cmake")
+                ),
             ]
             shprint(
                 sh.cmake, '.',

tests/recipes/test_icu.py

@@ -16,7 +16,7 @@ class TestIcuRecipe(RecipeCtx, unittest.TestCase):
 
     def test_url(self):
         self.assertTrue(self.recipe.versioned_url.startswith("http"))
-        self.assertIn(self.recipe.version, self.recipe.versioned_url)
+        self.assertIn(self.recipe.version.replace('.', '-'), self.recipe.versioned_url)
 
     @mock.patch(
         "pythonforandroid.recipe.Recipe.url", new_callable=mock.PropertyMock