Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add C++ runtime shared object to the Android APK

Browse source
This commit is contained in:
Mátyás Mustoha 2016-12-06 14:00:50 +01:00
parent c3c086e521
commit 2b99c3cd04
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
support/android/build-apk/src/main.rs
View file

@ -17,7 +17,7 @@ fn main() {
let (args, passthrough) = parse_arguments();
// Find all the native shared libraries that exist in the target directory.
let native_shared_libs = find_native_libs(&args);
let mut native_shared_libs = find_native_libs(&args);
// Get the SDK path from the ANDROID_HOME env.
let sdk_path = env::var("ANDROID_HOME").ok().expect("Please set the ANDROID_HOME environment variable");
@ -32,6 +32,14 @@ fn main() {
.ok()
.expect("Please set the ANDROID_PLATFORM environment variable");
// Add the C++ runtime .so
{
let libcpp_base_path = ndk_path.join("sources").join("cxx-stl").join("llvm-libc++").join("libs");
let libcpp_filename = "libc++_shared.so";
let libcpp_path = libcpp_base_path.join("armeabi").join(libcpp_filename);
native_shared_libs.insert(libcpp_filename.to_string(), libcpp_path);
}
// Get the standalone NDK path from NDK_STANDALONE env.
// let standalone_path = env::var("NDK_STANDALONE").ok().unwrap_or("/opt/ndk_standalone".to_string());
// let standalone_path = Path::new(&standalone_path);