Skip to content

Commit d1bb98b

Browse files
compnerdcompnerd
authored
Merge pull request #40625 from buttaface/droid-remove-icu
[android] Remove ICU build flags since that requirement was dropped in #40340
2 parents 526e77c + a3ea28f commit d1bb98b

File tree

11 files changed

+14
-165
lines changed

11 files changed

+14
-165
lines changed

‎docs/Android.md‎

Lines changed: 9 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -43,51 +43,22 @@ To follow along with this guide, you'll need:
4343

4444
## "Hello, world" on Android
4545

46-
### 1. Downloading (or building) the Swift Android stdlib dependencies
46+
### 1. Building the Swift stdlib for Android
4747

48-
You may have noticed that, in order to build the Swift stdlib for Linux, you
49-
needed to `apt-get install libicu-dev icu-devtools`. Similarly, building
50-
the Swift stdlib for Android requires the libiconv and libicu libraries.
51-
However, you'll need versions of these libraries that work on Android devices.
52-
53-
The steps are as follows:
54-
55-
1. Ensure you have `curl`, `autoconf`, `automake`, `libtool`, and
56-
`git` installed.
57-
2. Clone the [SwiftAndroid/libiconv-libicu-android](https://github.com/SwiftAndroid/libiconv-libicu-android)
58-
project. From the command-line, run the following command:
59-
`git clone https://github.com/SwiftAndroid/libiconv-libicu-android.git`.
60-
3. From the command-line, run `which ndk-build`. Confirm that the path to
61-
the `ndk-build` executable in the Android NDK you downloaded is displayed.
62-
If not, you may need to add the Android NDK directory to your `PATH`.
63-
4. Change directories into `libiconv-libicu-android`: `cd libiconv-libicu-android`
64-
5. Run the Swift build script: `./build-swift.sh`
65-
6. Confirm that the various `libicuXYZswift.so` libraries are located in the
66-
`armeabi-v7a` directory.
67-
68-
### 2. Building the Swift stdlib for Android
69-
70-
Enter your Swift directory, then run the build script, passing paths to the
71-
Android NDK, as well as the directories that contain the `libicuucswift.so` and
72-
`libicui18nswift.so` you downloaded or built in step one:
48+
Enter your Swift directory, then run the build script, passing the path to the
49+
Android NDK:
7350

7451
```
75-
$ ARM_DIR=path/to/libiconv-libicu-android/armeabi-v7a
7652
$ NDK_PATH=path/to/android-ndk-r23b
7753
$ utils/build-script \
7854
-R \ # Build in ReleaseAssert mode.
7955
--android \ # Build for Android.
8056
--android-ndk $NDK_PATH \ # Path to an Android NDK.
8157
--android-arch armv7 \ # Optionally specify Android architecture, alternately aarch64 or x86_64
82-
--android-api-level 21 \ # The Android API level to target. Swift only supports 21 or greater.
83-
--android-icu-uc ${ARM_DIR}/libicuucswift.so \
84-
--android-icu-uc-include ${ARM_DIR}/icu/source/common \
85-
--android-icu-i18n ${ARM_DIR}/libicui18nswift.so \
86-
--android-icu-i18n-include ${ARM_DIR}/icu/source/i18n \
87-
--android-icu-data ${ARM_DIR}/libicudataswift.so
58+
--android-api-level 21 # The Android API level to target. Swift only supports 21 or greater.
8859
```
8960

90-
### 3. Compiling `hello.swift` to run on an Android device
61+
### 2. Compiling `hello.swift` to run on an Android device
9162

9263
Create a simple Swift file named `hello.swift`:
9364

@@ -121,7 +92,7 @@ This is exactly the error we want: the executable is built to run on an
12192
Android device--it does not run on Linux. Next, let's deploy it to an Android
12293
device in order to execute it.
12394

124-
### 4. Deploying the build products to the device
95+
### 3. Deploying the build products to the device
12596

12697
You can use the `adb push` command to copy build products from your Linux
12798
environment to your Android device. If you haven't already installed `adb`,
@@ -142,14 +113,6 @@ $ adb push build/Ninja-ReleaseAssert/swift-linux-x86_64/lib/swift/android/libswi
142113
$ adb push build/Ninja-ReleaseAssert/swift-linux-x86_64/lib/swift/android/libswiftRemoteMirror.so /data/local/tmp
143114
```
144115

145-
You will also need to push the icu libraries:
146-
147-
```
148-
adb push /path/to/libicu-android/armeabi-v7a/libicudataswift.so /data/local/tmp
149-
adb push /path/to/libicu-android/armeabi-v7a/libicui18nswift.so /data/local/tmp
150-
adb push /path/to/libicu-android/armeabi-v7a/libicuucswift.so /data/local/tmp
151-
```
152-
153116
In addition, you'll also need to copy the Android NDK's libc++:
154117

155118
```
@@ -162,7 +125,7 @@ previous step:
162125
$ adb push hello /data/local/tmp
163126
```
164127

165-
### 5. Running "Hello, world" on your Android device
128+
### 4. Running "Hello, world" on your Android device
166129

167130
You can use the `adb shell` command to execute the `hello` executable on
168131
the Android device:
@@ -182,7 +145,7 @@ Congratulations! You've just run your first Swift program on Android.
182145
## Running the Swift test suite hosted on an Android device
183146

184147
When running the test suite, build products are automatically pushed to your
185-
device. As in part four, you'll need to connect your Android device via USB:
148+
device. As in part three, you'll need to connect your Android device via USB:
186149

187150
1. Connect your Android device to your computer via USB. Ensure that remote
188151
debugging is enabled for that device by following the official instructions:
@@ -198,10 +161,5 @@ $ utils/build-script \
198161
--android \ # Build for Android.
199162
--android-ndk ~/android-ndk-r23b \ # Path to an Android NDK.
200163
--android-arch armv7 \ # Optionally specify Android architecture, alternately aarch64
201-
--android-ndk-version 21 \
202-
--android-icu-uc ~/libicu-android/armeabi-v7a/libicuuc.so \
203-
--android-icu-uc-include ~/libicu-android/armeabi-v7a/icu/source/common \
204-
--android-icu-i18n ~/libicu-android/armeabi-v7a/libicui18n.so \
205-
--android-icu-i18n-include ~/libicu-android/armeabi-v7a/icu/source/i18n/ \
206-
--android-icu-data ~/libicu-android/armeabi-v7a/libicudata.so
164+
--android-ndk-version 21
207165
```

‎docs/AndroidBuild.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,6 @@ cmake -C S:\swift-build\cmake\caches\android-armv7.cmake
7474
-DANDROID_ALTERNATE_TOOLCHAIN=S:/b/a/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr ^
7575
-DLLVM_DIR=S:/b/a/llvm/lib/cmake/llvm ^
7676
-DSWIFT_NATIVE_SWIFT_TOOLS_PATH=S:/b/a/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin ^
77-
-DSWIFT_ANDROID_armv7_ICU_UC_INCLUDE=S:/b/a/Library/icu-64/usr/include/unicode ^
78-
-DSWIFT_ANDROID_armv7_ICU_UC=S:/b/a/Library/icu-64/usr/lib/libicuuc64.so ^
79-
-DSWIFT_ANDROID_armv7_ICU_I18N_INCLUDE=S:/b/a/Library/icu-64/usr/include ^
80-
-DSWIFT_ANDROID_armv7_ICU_I18N=S:/b/a/Library/icu-64/usr/lib/libicuin64.so ^
8177
S:/swift
8278
ninja
8379
ninja install

‎test/CMakeLists.txt‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -340,13 +340,7 @@ foreach(SDK ${SWIFT_SDKS})
340340
--destination "${SWIFT_ANDROID_DEPLOY_DEVICE_PATH}"
341341
--destination-arch "${ARCH}"
342342
# Build products like libswiftCore.so.
343-
"${SWIFTLIB_DIR}/android"
344-
# These two directories may contain the same libraries,
345-
# but upload both to device just in case. Duplicates will be
346-
# overwritten, and uploading doesn't take very long anyway.
347-
"${SWIFT_ANDROID_${ARCH}_ICU_UC}"
348-
"${SWIFT_ANDROID_${ARCH}_ICU_I18N}"
349-
"${SWIFT_ANDROID_${ARCH}_ICU_DATA}")
343+
"${SWIFTLIB_DIR}/android")
350344
endif()
351345
add_custom_target("upload-stdlib${VARIANT_SUFFIX}"
352346
${command_upload_stdlib}

‎utils/android/build-toolchain‎

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎utils/build-presets.ini‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -927,12 +927,6 @@ libcxx
927927
android
928928
android-ndk=%(ndk_path)s
929929
android-api-level=21
930-
android-icu-uc=%(arm_dir)s/libicuucswift.so
931-
android-icu-uc-include=%(arm_dir)s/icu/source/common
932-
android-icu-i18n=%(arm_dir)s/libicui18nswift.so
933-
android-icu-i18n-include=%(arm_dir)s/icu/source/i18n
934-
android-icu-data=%(arm_dir)s/libicudataswift.so
935-
936930
build-swift-static-stdlib
937931
build-swift-static-sdk-overlay
938932
build-swift-stdlib-unittest-extra
@@ -945,8 +939,6 @@ installable-package=%(installable_package)s
945939

946940
host-test
947941

948-
extra-cmake-options=-DSWIFT_ENABLE_LLD_LINKER:BOOL=OFF
949-
950942
install-prefix=/usr
951943
install-llvm
952944
install-swift

‎utils/build-script‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -225,18 +225,10 @@ def validate_arguments(toolchain, args):
225225

226226
if args.android:
227227
if args.android_ndk is None or \
228-
args.android_api_level is None or \
229-
args.android_icu_uc is None or \
230-
args.android_icu_uc_include is None or \
231-
args.android_icu_i18n is None or \
232-
args.android_icu_i18n_include is None or \
233-
args.android_icu_data is None:
228+
args.android_api_level is None:
234229
fatal_error(
235-
"when building for Android, --android-ndk, "
236-
"--android-api-level, --android-icu-uc, "
237-
"--android-icu-uc-include, --android-icu-i18n, "
238-
"--android-icu-i18n-include, and --android-icu-data "
239-
"must be specified")
230+
"when building for Android, --android-ndk "
231+
"and --android-api-level must be specified")
240232

241233
targets_needing_toolchain = [
242234
'build_indexstoredb',

‎utils/build-script-impl‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,6 @@ KNOWN_SETTINGS=(
8989
android-api-level "" "The Android API level to target when building for Android. Currently only 21 or above is supported"
9090
android-arch "armv7" "The Android target architecture when building for Android"
9191
android-deploy-device-path "" "Path on an Android device to which built Swift stdlib products will be deployed"
92-
android-icu-data "" "Path to libicudata.so"
93-
android-icu-i18n "" "Path to libicui18n.so"
94-
android-icu-i18n-include "" "Path to a directory containing headers libicui18n"
95-
android-icu-uc "" "Path to libicuuc.so"
96-
android-icu-uc-include "" "Path to a directory containing headers for libicuuc"
9792
android-ndk "" "An absolute path to the NDK that will be used as a libc implementation for Android builds"
9893

9994
## Darwin Options
@@ -1909,11 +1904,6 @@ for host in "${ALL_HOSTS[@]}"; do
19091904
cmake_options=(
19101905
"${cmake_options[@]}"
19111906
-DSWIFT_ANDROID_NDK_PATH:STRING="${ANDROID_NDK}"
1912-
-DSWIFT_ANDROID_${ANDROID_ARCH}_ICU_UC:STRING="${ANDROID_ICU_UC}"
1913-
-DSWIFT_ANDROID_${ANDROID_ARCH}_ICU_UC_INCLUDE:STRING="${ANDROID_ICU_UC_INCLUDE}"
1914-
-DSWIFT_ANDROID_${ANDROID_ARCH}_ICU_I18N:STRING="${ANDROID_ICU_I18N}"
1915-
-DSWIFT_ANDROID_${ANDROID_ARCH}_ICU_I18N_INCLUDE:STRING="${ANDROID_ICU_I18N_INCLUDE}"
1916-
-DSWIFT_ANDROID_${ANDROID_ARCH}_ICU_DATA:STRING="${ANDROID_ICU_DATA}"
19171907
-DSWIFT_ANDROID_DEPLOY_DEVICE_PATH:STRING="${ANDROID_DEPLOY_DEVICE_PATH}"
19181908
-DSWIFT_SDK_ANDROID_ARCHITECTURES:STRING="${ANDROID_ARCH}"
19191909
)

‎utils/build_swift/build_swift/driver_arguments.py‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,16 +1176,6 @@ def create_argument_parser():
11761176
help='The Android API level to target when building for Android. '
11771177
'Currently only 21 or above is supported')
11781178

1179-
option('--android-icu-uc', store_path,
1180-
help='Path to libicuuc.so')
1181-
option('--android-icu-uc-include', store_path,
1182-
help='Path to a directory containing headers for libicuuc')
1183-
option('--android-icu-i18n', store_path,
1184-
help='Path to libicui18n.so')
1185-
option('--android-icu-i18n-include', store_path,
1186-
help='Path to a directory containing headers libicui18n')
1187-
option('--android-icu-data', store_path,
1188-
help='Path to libicudata.so')
11891179
option('--android-deploy-device-path', store_path,
11901180
default=android.adb.commands.DEVICE_TEMP_DIR,
11911181
help='Path on an Android device to which built Swift stdlib '

‎utils/build_swift/tests/expected_options.py‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@
4242
'android': False,
4343
'android_api_level': '21',
4444
'android_deploy_device_path': '/data/local/tmp',
45-
'android_icu_i18n': None,
46-
'android_icu_i18n_include': None,
47-
'android_icu_uc': None,
48-
'android_icu_uc_include': None,
49-
'android_icu_data': None,
5045
'android_ndk': None,
5146
'android_arch': 'armv7',
5247
'assertions': True,
@@ -688,11 +683,6 @@ class BuildScriptImplOption(_BaseOption):
688683
SetTrueOption('--swift-freestanding-is-darwin'),
689684

690685
PathOption('--android-deploy-device-path'),
691-
PathOption('--android-icu-i18n'),
692-
PathOption('--android-icu-i18n-include'),
693-
PathOption('--android-icu-uc'),
694-
PathOption('--android-icu-uc-include'),
695-
PathOption('--android-icu-data'),
696686
PathOption('--android-ndk'),
697687
PathOption('--build-subdir'),
698688
SetTrueOption('--relocate-xdg-cache-home-under-build-subdir'),

‎utils/swift_build_support/swift_build_support/build_script_invocation.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -311,11 +311,6 @@ def convert_to_impl_arguments(self):
311311
"--android-arch", args.android_arch,
312312
"--android-ndk", args.android_ndk,
313313
"--android-api-level", args.android_api_level,
314-
"--android-icu-uc", args.android_icu_uc,
315-
"--android-icu-uc-include", args.android_icu_uc_include,
316-
"--android-icu-i18n", args.android_icu_i18n,
317-
"--android-icu-i18n-include", args.android_icu_i18n_include,
318-
"--android-icu-data", args.android_icu_data,
319314
]
320315
# If building natively on an Android host, only pass the API level.
321316
if StdlibDeploymentTarget.Android.contains(StdlibDeploymentTarget

0 commit comments

Comments
 (0)