Skip to content
Permalink
Browse files

Add C++ runtime shared object to the Android APK

  • Loading branch information
mmatyas committed Dec 9, 2016
1 parent c3c086e commit 2b99c3cd043bd309bbdf1f2758c25f424c8b79cb
Showing with 9 additions and 1 deletion.
  1. +9 −1 support/android/build-apk/src/main.rs
@@ -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);

0 comments on commit 2b99c3c

Please sign in to comment.
You can’t perform that action at this time.