diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/servo/bootstrap.py | 4 | ||||
| -rw-r--r-- | python/servo/build_commands.py | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/python/servo/bootstrap.py b/python/servo/bootstrap.py index a38fb631eee..c83a196cfbd 100644 --- a/python/servo/bootstrap.py +++ b/python/servo/bootstrap.py @@ -114,8 +114,8 @@ def linux(context, force=False): 'libbz2-dev', 'liblzma-dev', 'libosmesa6-dev', 'libxmu6', 'libxmu-dev', 'libglu1-mesa-dev', 'libgles2-mesa-dev', 'libegl1-mesa-dev', 'libdbus-1-dev', 'libharfbuzz-dev', - 'ccache', 'clang', 'autoconf2.13', "libunwind-dev"] - pkgs_dnf = ['libtool', 'gcc-c++', 'libXi-devel', 'freetype-devel', + 'ccache', 'clang', 'autoconf2.13', 'libunwind-dev'] + pkgs_dnf = ['libtool', 'gcc-c++', 'libXi-devel', 'freetype-devel', 'libunwind-devel', 'mesa-libGL-devel', 'mesa-libEGL-devel', 'glib2-devel', 'libX11-devel', 'libXrandr-devel', 'gperf', 'fontconfig-devel', 'cabextract', 'ttmkfdir', 'python2', 'python2-virtualenv', 'python2-pip', 'expat-devel', 'rpm-build', 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 |