Merge pull request opencv#10923 from Preventis:patch-ios

benjohnde · alalek · commit 2f0060e39981 · 2018-03-13T16:09:26.000+03:00
Fixed dynamic build script for iOS (opencv#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
diff --git 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>
+</plist>
diff --git a/platforms/ios/build_framework.py b/platforms/ios/build_framework.py
@@ -152,6 +152,9 @@ def getBuildCommand(self, archs, target):
                 "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())

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,9 @@ def getBuildCommand(self, archs, target):`
`152`	`152`	`"ONLY_ACTIVE_ARCH=NO",`
`153`	`153`	`]`
`154`	`154`
	`155`	`+ if not self.bitcodedisabled:`
	`156`	`+ buildcmd.append("BITCODE_GENERATION_MODE=bitcode")`
	`157`	`+`
`155`	`158`	`for arch in archs:`
`156`	`159`	`buildcmd.append("-arch")`
`157`	`160`	`buildcmd.append(arch.lower())`