diff --git a/docs/Android.md b/docs/Android.md index ff5ea1f960f0d..ffd867ec1aeb4 100644 --- a/docs/Android.md +++ b/docs/Android.md @@ -42,7 +42,7 @@ To follow along with this guide, you'll need: turn on remote debugging by following the official instructions: https://developer.chrome.com/devtools/docs/remote-debugging. -## Part One: "Hello, world" on Android +## "Hello, world" on Android ### 1. Downloading (or building) the Swift Android stdlib dependencies @@ -309,7 +309,7 @@ Hello, Android Congratulations! You've just run your first Swift program on Android. -## Part Two: Running the Swift test suite hosted on an Android device +## Running the Swift test suite hosted on an Android device When running the test suite, build products are automatically pushed to your device. As in part one, you'll need to connect your Android device via USB: @@ -333,3 +333,19 @@ $ utils/build-script \ --android-icu-i18n ~/libicu-android/armeabi-v7a/libicui18n.so \ --android-icu-i18n-include ~/libicu-android/armeabi-v7a/icu/source/i18n/ ``` + +## Build Android Toolchain + +This toolchain will generate the .so and .swiftmodule files of the Swift standard library and Foundation framework for the Android environment, armv7 architecture. Those files are needed when building any Swift library to be included in an application for Android. + +To build the toolchain run: + +``` +$ utils/android/build-toolchain +``` + +It will be built on: + +``` +path/to/swift-source/swift-android-toolchain +``` diff --git a/utils/android/README.md b/utils/android/README.md deleted file mode 100644 index 28ad49b365caa..0000000000000 --- a/utils/android/README.md +++ /dev/null @@ -1,16 +0,0 @@ - -# Build Android Toolchain - -This toolchain will generate the .so and .swiftmodule files of the Swift standard library and Foundation framework for the Android environment, armv7 architecture. Those files are needed when building any Swift library to be included in an application for Android. - -To build the toolchain run: - -``` -android$ ./build-toolchain -``` - -It will be built on: - -``` -path/to/swift-source/swift-android-toolchain -```