diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-05-24 18:15:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-24 18:15:37 -0400 |
| commit | 61d2641a7d7c27b8c3107579324582451bc5588f (patch) | |
| tree | 93d3ed0b1496a270f5ec290fe6f84a8f6d9a349d /python | |
| parent | 2181872973ce49b50ed2dd077c4fdde6f4c5d019 (diff) | |
| parent | ccde5867fb67c03c42933e3625bb07cfd019cb68 (diff) | |
| download | servo-61d2641a7d7c27b8c3107579324582451bc5588f.tar.gz servo-61d2641a7d7c27b8c3107579324582451bc5588f.zip | |
Auto merge of #23364 - jdm:ndk-llvm2, r=asajeffrey
Use llvm toolchain for android build
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23364)
<!-- Reviewable:end -->
Diffstat (limited to 'python')
| -rw-r--r-- | python/servo/build_commands.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index a6e61905675..1a00d8be97d 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -352,7 +352,6 @@ class MachCommands(CommandBase): sys.exit(1) env["RUST_TARGET"] = target - env["ANDROID_TOOLCHAIN_NAME"] = android_toolchain_name with cd(openssl_dir): status = call( make_cmd + ["-f", "openssl.makefile"], @@ -386,9 +385,7 @@ class MachCommands(CommandBase): android_toolchain_prefix + "-4.9", "prebuilt", host) gcc_libs = path.join(gcc_toolchain, "lib", "gcc", android_toolchain_name, "4.9.x") - env['PATH'] = (path.join(llvm_toolchain, "bin") + ':' - + path.join(gcc_toolchain, "bin") + ':' - + env['PATH']) + env['PATH'] = (path.join(llvm_toolchain, "bin") + ':' + env['PATH']) env['ANDROID_SYSROOT'] = path.join(env['ANDROID_NDK'], "sysroot") support_include = path.join(env['ANDROID_NDK'], "sources", "android", "support", "include") cpufeatures_include = path.join(env['ANDROID_NDK'], "sources", "android", "cpufeatures") @@ -468,7 +465,6 @@ class MachCommands(CommandBase): env["NDK_ANDROID_VERSION"] = android_api env["ANDROID_ABI"] = android_lib env["ANDROID_PLATFORM"] = android_platform - env["ANDROID_TOOLCHAIN_NAME"] = "clang" env["NDK_CMAKE_TOOLCHAIN_FILE"] = path.join(env['ANDROID_NDK'], "build", "cmake", "android.toolchain.cmake") env["CMAKE_TOOLCHAIN_FILE"] = path.join(self.android_support_dir(), "toolchain.cmake") # Set output dir for gradle aar files |