Skip to content

Added build-android script which will build libdispatch for Android #302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 30 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
5d25e42
INSTALL.md
amraboelela Sep 15, 2017
85af8ba
.gitignore
amraboelela Sep 15, 2017
317fd6a
Added build-android script which will build libdispatch for Android
amraboelela Sep 15, 2017
fb87e45
Cleanup
amraboelela Sep 15, 2017
21b095a
Fixed the toolchain path
amraboelela Sep 15, 2017
b13a600
build-android-cmake
amraboelela Sep 19, 2017
aefacdc
build-android .gitignore
amraboelela Sep 20, 2017
e42c509
Now using cmake
amraboelela Sep 20, 2017
be61e7f
Merge remote-tracking branch 'apple/master' into build-android
amraboelela Sep 20, 2017
8e0f338
Using build-script to build Dispatch.swiftmodule
amraboelela Sep 20, 2017
7360ab6
Merge remote-tracking branch 'apple/master' into build-android
amraboelela Sep 20, 2017
5fac806
Reverted my changes to go back to use autoconf
amraboelela Sep 20, 2017
2e905f8
Copying also swiftmodule,swiftdoc
amraboelela Sep 20, 2017
db94a73
Merge remote-tracking branch 'apple/master' into build-android
amraboelela Sep 27, 2017
e512e61
Merge remote-tracking branch 'origin/build-android' into build-android
amraboelela Sep 27, 2017
e0e0740
armv7
amraboelela Sep 27, 2017
24f1e9b
build-android hw_config.h
amraboelela Sep 27, 2017
ebfbb55
Merge branch 'build-android' of http://github.com/amraboelela/swift-c…
amraboelela Sep 27, 2017
1bdb62d
removed build-android-test
amraboelela Sep 27, 2017
68e0c47
Added build-android-cmake
amraboelela Sep 27, 2017
59bd341
cleanup
amraboelela Sep 27, 2017
dcdb947
API 22
amraboelela Sep 30, 2017
787ed99
build-android build-android-cmake
amraboelela Oct 6, 2017
41d47b8
Merge remote-tracking branch 'apple/master' into build-android
amraboelela Oct 6, 2017
f63dcbe
Changed the build path
amraboelela Oct 8, 2017
dfb892f
build-android
amraboelela Oct 10, 2017
7d59be2
build-android
amraboelela Oct 11, 2017
82c205a
Merge remote-tracking branch 'apple/master' into build-android
amraboelela Oct 12, 2017
c37e9ac
armv7
amraboelela Oct 15, 2017
38e6a8c
build-android-cmake
amraboelela Oct 16, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
build-android build-android-cmake
  • Loading branch information
amraboelela committed Oct 6, 2017
commit 787ed997a4049fcc3ad5edf376e72749d8c22644
4 changes: 2 additions & 2 deletions build-android
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ cd "$(dirname $0)/.." || exit 1
SWIFT_PATH=$PWD

ANDROID_NDK_PATH="${ANDROID_NDK_PATH:?Please set the Android NDK path in the ANDROID_NDK_PATH environment variable}"
SWIFT_ANDROID_BUILD_PATH="${SWIFT_ANDROID_BUILD_PATH:?Please set the Swift Android build path in the SWIFT_ANDROID_BUILD_PATH environment variable}"

SWIFT_ANDROID_TOOLCHAIN_PATH="${SWIFT_PATH}/swift-android-toolchain"
SWIFT_ANDROID_BUILD_PATH="${SWIFT_PATH}/build/Ninja-ReleaseAssert"

cd ${SWIFT_PATH}/swift-corelibs-libdispatch
sh autogen.sh
Expand All @@ -34,7 +34,7 @@ env \
--enable-android \
--host=arm-linux-androideabi \
--with-android-ndk=$ANDROID_NDK_PATH \
--with-android-api-level=22 \
--with-android-api-level=21 \
--disable-build-tests \
--prefix=$SWIFT_ANDROID_TOOLCHAIN_PATH/usr

Expand Down
5 changes: 3 additions & 2 deletions build-android-cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ cd "$(dirname $0)/.." || exit 1
SWIFT_PATH=$PWD

ANDROID_NDK_PATH="${ANDROID_NDK_PATH:?Please set the Android NDK path in the ANDROID_NDK_PATH environment variable}"
SWIFT_ANDROID_BUILD_PATH="${SWIFT_ANDROID_BUILD_PATH:?Please set the Swift Android build path in the SWIFT_ANDROID_BUILD_PATH environment variable}"

SWIFT_ANDROID_TOOLCHAIN_PATH="${SWIFT_PATH}/swift-android-toolchain"
SWIFT_ANDROID_BUILD_PATH="${SWIFT_PATH}/build/Ninja-ReleaseAssert"

cd ${SWIFT_PATH}/swift-corelibs-libdispatch

Expand All @@ -32,7 +32,8 @@ cmake \
-DCMAKE_ANDROID_NDK=$ANDROID_NDK_PATH \
-DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=$SWIFT_ANDROID_BUILD_PATH/llvm-linux-x86_64/bin/clang \
-DCMAKE_CXX_COMPILER=$SWIFT_ANDROID_BUILD_PATH/llvm-linux-x86_64/bin/clang++ \
-DCMAKE_SWIFT_COMPILER=$SWIFT_ANDROID_BUILD_PATH/swift-linux-x86_64/bin/swiftc
-DCMAKE_SWIFT_COMPILER=$SWIFT_ANDROID_BUILD_PATH/swift-linux-x86_64/bin/swiftc \
-DENABLE_SWIFT=YES

make

Expand Down