diff options
| author | Edward Hervey <bilboed@bilboed.com> | 2015-01-28 13:56:54 +0100 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2015-01-28 13:56:54 +0100 |
| commit | bd2f46dc5e15281548c64169105051db63cbe08a (patch) | |
| tree | 03b0b74ec33c6a3049e33ff3f7f7339b2fb22b06 | |
| parent | 16a8c4d7bc111a5129bb956a482a6afdcac34d03 (diff) | |
recipes/openh264: Fix build on Android Lollipop and add new arch
We need to specify the Android level used (yay for custom build scripts)
| -rw-r--r-- | recipes/openh264.recipe | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/recipes/openh264.recipe b/recipes/openh264.recipe index f192eb93..aed27387 100644 --- a/recipes/openh264.recipe +++ b/recipes/openh264.recipe @@ -41,10 +41,17 @@ class Recipe(recipe.Recipe): elif self.config.target_arch == Architecture.X86_64: make += ' ARCH=x86_64' elif self.config.target_platform == Platform.ANDROID: - make += ' OS=android TARGET=android-9' + if self.config.target_distro_version == DistroVersion.ANDROID_LOLLIPOP: + make += ' OS=android TARGET=android-21 NDKLEVEL=21' + else: + make += ' OS=android TARGET=android-9' make += ' NDKROOT=' + self.config.toolchain_prefix if self.config.target_arch == Architecture.X86: make += ' ARCH=x86' + elif self.config.target_arch == Architecture.ARM64: + make += ' ARCH=arm64' + elif self.config.target_arch == Architecture.X86_64: + make += ' ARCH=x86_64' elif self.config.target_platform == Platform.WINDOWS: make += ' OS=mingw_nt' if self.config.target_arch == Architecture.X86: |