[[ Bug 23193 ]] Conditionally include AppTrackingTransparency framework

livecodepanos · livecodepanos · commit dbe3018b8360 · 2021-06-03T17:22:10.000+03:00
This patch ensures the AppTrackingTransparency framework is included only if the version
of the target_sdk is 14+
diff --git a/engine/bind-ios-standalone.sh b/engine/bind-ios-standalone.sh
@@ -1,13 +1,23 @@
 #!/bin/bash
 
+read SDK_MAJORVERSION SDK_MINORVERSION <<<${SDK_NAME//[^0-9]/ }
+
 set -e
 
 case "$1" in
 	*-community.lcext)
-		DEPS_FILE="${SRCROOT}/standalone.ios"
+		if [[ $SDK_MAJORVERSION -lt 14 ]] ; then
+			DEPS_FILE="${SRCROOT}/standalone.ios"
+		else
+			DEPS_FILE="${SRCROOT}/standalone14.ios"
+		fi
 		;;
 	*-commercial.lcext)
-		DEPS_FILE="${SRCROOT}/../livecode/engine/standalone.ios"
+		if [[ $SDK_MAJORVERSION -lt 14 ]] ; then
+			DEPS_FILE="${SRCROOT}/../livecode/engine/standalone.ios"
+		else
+			DEPS_FILE="${SRCROOT}/../livecode/engine/standalone14.ios"
+		fi
 		;;
 esac
 
diff --git a/engine/engine.gyp b/engine/engine.gyp
@@ -289,12 +289,26 @@
 						
 						# Forces all dependencies to be linked properly
 						'type': 'shared_library',
+                        
+						'conditions':
+						[
+							[
+								'("11" not in target_sdk) and ("12" not in target_sdk) and ("13" not in target_sdk)',
+								{
+									'variables':
+									{
+										'deps_file': '${SRCROOT}/standalone14.ios',
+									},
+								},
+								{
+									'variables':
+									{
+										'deps_file': '${SRCROOT}/standalone.ios',
+									},
+								}
+							],
+						],
 						
-						'variables':
-						{
-							'deps_file': '${SRCROOT}/standalone.ios',
-						},
-
 						'xcode_settings':
 						{
 							'DEAD_CODE_STRIPPING': 'NO',
diff --git a/engine/kernel.gyp b/engine/kernel.gyp
@@ -187,7 +187,7 @@
                         },
                     ],
                     [
-                        'OS == "ios" and target_sdk >= "14.0"',
+                        'OS == "ios" and ("11" not in target_sdk) and ("12" not in target_sdk) and ("13" not in target_sdk)',
                         {
                             'libraries':
                             [
diff --git a/engine/standalone.ios b/engine/standalone.ios
@@ -22,4 +22,3 @@ framework EventKit
 framework EventKitUI
 framework Security
 framework WebKit
-framework AppTrackingTransparency
diff --git a/engine/standalone14.ios b/engine/standalone14.ios
@@ -0,0 +1,25 @@
+library z
+framework CoreMedia
+framework CoreGraphics
+framework QuartzCore
+framework AVFoundation
+framework AVKit
+framework CoreLocation
+framework MediaPlayer
+framework MessageUI
+framework AudioToolbox
+framework CFNetwork
+framework SystemConfiguration
+framework OpenGLES
+framework Foundation
+framework UIKit
+framework CoreText
+framework StoreKit
+framework CoreMotion
+framework AddressBook
+framework AddressBookUI
+framework EventKit
+framework EventKitUI
+framework Security
+framework WebKit
+framework AppTrackingTransparency

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@`
`187`	`187`	`},`
`188`	`188`	`],`
`189`	`189`	`[`
`190`		`- 'OS == "ios" and target_sdk >= "14.0"',`
	`190`	`+ 'OS == "ios" and ("11" not in target_sdk) and ("12" not in target_sdk) and ("13" not in target_sdk)',`
`191`	`191`	`{`
`192`	`192`	`'libraries':`
`193`	`193`	`[`