From 2f0060e39981b8c94c0385588f758425a0ea616a Mon Sep 17 00:00:00 2001
From: Ben John <github@benjohn.de>
Date: Tue, 13 Mar 2018 14:09:26 +0100
Subject: [PATCH] Merge pull request #10923 from Preventis:patch-ios

Fixed dynamic build script for iOS (#10923)

* Readded UIDeviceFamily (was removed in beec247)

* Added correct bitcode flag to python build script for iOS

* Missed the bitcodedisabled check

* Corrected the syntax in my proposed changes
---
 platforms/ios/Info.Dynamic.plist.in | 7 ++++++-
 platforms/ios/build_framework.py    | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/platforms/ios/Info.Dynamic.plist.in b/platforms/ios/Info.Dynamic.plist.in
index 4ff68cc..00c9277 100644
--- a/platforms/ios/Info.Dynamic.plist.in
+++ b/platforms/ios/Info.Dynamic.plist.in
@@ -24,5 +24,10 @@
     </array>
     <key>MinimumOSVersion</key>
     <string>8.0</string>
+    <key>UIDeviceFamily</key>
+    <array>
+        <integer>1</integer>
+        <integer>2</integer>
+    </array>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/platforms/ios/build_framework.py b/platforms/ios/build_framework.py
index 7428ddc..32305f9 100644
--- a/platforms/ios/build_framework.py
+++ b/platforms/ios/build_framework.py
@@ -152,6 +152,9 @@ class Builder:
                 "ONLY_ACTIVE_ARCH=NO",
             ]
 
+            if not self.bitcodedisabled:
+                buildcmd.append("BITCODE_GENERATION_MODE=bitcode")
+
             for arch in archs:
                 buildcmd.append("-arch")
                 buildcmd.append(arch.lower())
-- 
2.7.4