Skip to content

Commit 7dd3c56

Browse files
committed
Add Swift definition for NDK version
1 parent d280dfa commit 7dd3c56

File tree

1 file changed

+19
-1
lines changed

1 file changed

+19
-1
lines changed

Package.swift

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ let javaIncludePath = "\(javaHome)/include"
4343
let ndkVersion = ProcessInfo.processInfo.environment["ANDROID_NDK_VERSION"].flatMap { UInt($0) } ?? 27
4444
let ndkBinder = ndkVersion >= 29 // binder_ndk Requires NDK 29
4545

46+
let ndkVersionDefine = SwiftSetting.define("ANDROID_NDK_VERSION_" + ndkVersion.description)
47+
4648
var package = Package(
4749
name: "SwiftAndroid",
4850
platforms: [
@@ -134,6 +136,7 @@ var package = Package(
134136
swiftSettings: [
135137
.swiftLanguageMode(.v5),
136138
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"]),
139+
ndkVersionDefine
137140
]
138141
),
139142
.target(
@@ -194,6 +197,7 @@ var package = Package(
194197
],
195198
swiftSettings: [
196199
.swiftLanguageMode(.v5),
200+
ndkVersionDefine
197201
]
198202
),
199203
.target(
@@ -204,6 +208,7 @@ var package = Package(
204208
exclude: ["swift-java.config"],
205209
swiftSettings: [
206210
.swiftLanguageMode(.v5),
211+
ndkVersionDefine
207212
]
208213
),
209214
.target(
@@ -224,6 +229,7 @@ var package = Package(
224229
exclude: ["swift-java.config"],
225230
swiftSettings: [
226231
.swiftLanguageMode(.v5),
232+
ndkVersionDefine
227233
]
228234
),
229235
.target(
@@ -234,6 +240,7 @@ var package = Package(
234240
exclude: ["swift-java.config"],
235241
swiftSettings: [
236242
.swiftLanguageMode(.v5),
243+
ndkVersionDefine
237244
]
238245
),
239246
.target(
@@ -245,6 +252,7 @@ var package = Package(
245252
exclude: ["swift-java.config"],
246253
swiftSettings: [
247254
.swiftLanguageMode(.v5),
255+
ndkVersionDefine
248256
]
249257
),
250258
.target(
@@ -256,6 +264,7 @@ var package = Package(
256264
exclude: ["swift-java.config"],
257265
swiftSettings: [
258266
.swiftLanguageMode(.v5),
267+
ndkVersionDefine
259268
]
260269
),
261270
.target(
@@ -268,6 +277,7 @@ var package = Package(
268277
exclude: ["swift-java.config"],
269278
swiftSettings: [
270279
.swiftLanguageMode(.v5),
280+
ndkVersionDefine
271281
]
272282
),
273283
.target(
@@ -281,6 +291,7 @@ var package = Package(
281291
exclude: ["swift-java.config"],
282292
swiftSettings: [
283293
.swiftLanguageMode(.v5),
294+
ndkVersionDefine
284295
]
285296
),
286297
.target(
@@ -294,6 +305,7 @@ var package = Package(
294305
exclude: ["swift-java.config"],
295306
swiftSettings: [
296307
.swiftLanguageMode(.v5),
308+
ndkVersionDefine
297309
]
298310
),
299311
.target(
@@ -308,6 +320,7 @@ var package = Package(
308320
exclude: ["swift-java.config"],
309321
swiftSettings: [
310322
.swiftLanguageMode(.v5),
323+
ndkVersionDefine
311324
]
312325
),
313326
.target(
@@ -327,6 +340,7 @@ var package = Package(
327340
exclude: ["swift-java.config"],
328341
swiftSettings: [
329342
.swiftLanguageMode(.v5),
343+
ndkVersionDefine
330344
]
331345
),
332346
.target(
@@ -342,6 +356,7 @@ var package = Package(
342356
exclude: ["swift-java.config"],
343357
swiftSettings: [
344358
.swiftLanguageMode(.v5),
359+
ndkVersionDefine
345360
]
346361
),
347362
.target(
@@ -355,6 +370,7 @@ var package = Package(
355370
exclude: ["swift-java.config"],
356371
swiftSettings: [
357372
.swiftLanguageMode(.v5),
373+
ndkVersionDefine
358374
]
359375
),
360376
.target(
@@ -371,6 +387,7 @@ var package = Package(
371387
],
372388
swiftSettings: [
373389
.swiftLanguageMode(.v6),
390+
ndkVersionDefine
374391
],
375392
linkerSettings: [
376393
.linkedLibrary("log", .when(platforms: [.android]))
@@ -390,7 +407,8 @@ var package = Package(
390407
"AndroidNDK"
391408
],
392409
swiftSettings: [
393-
.swiftLanguageMode(.v6)
410+
.swiftLanguageMode(.v6),
411+
ndkVersionDefine
394412
],
395413
linkerSettings: [
396414
.linkedLibrary("android", .when(platforms: [.android]))

0 commit comments

Comments
 (0)