Skip to content

Commit 97a04a0

Browse files
committed
[build-script] Fix redundant Android args
The same set of Android build-script-impl args are set twice, most likely due to a bad rebase.
1 parent 1d78da3 commit 97a04a0

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

utils/build-script

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,17 +1149,7 @@ the number of parallel build jobs to use""",
11491149
if args.cmake_generator == 'Ninja' and \
11501150
not swift_build_support.ninja.is_ninja_installed():
11511151
build_script_impl_args += ["--build-ninja"]
1152-
if args.android:
1153-
build_script_impl_args += [
1154-
"--android-ndk", args.android_ndk,
1155-
"--android-ndk-version", args.android_ndk_version,
1156-
"--android-ndk-toolchain-version",
1157-
args.android_ndk_toolchain_version,
1158-
"--android-icu-uc", args.android_icu_uc,
1159-
"--android-icu-uc-include", args.android_icu_uc_include,
1160-
"--android-icu-i18n", args.android_icu_i18n,
1161-
"--android-icu-i18n-include", args.android_icu_i18n_include,
1162-
]
1152+
11631153
if args.skip_build_linux:
11641154
build_script_impl_args += ["--skip-build-linux"]
11651155
if args.skip_build_freebsd:

0 commit comments

Comments
 (0)