From 9d52fb88abf3843c7db338120e9f518a1834f80f Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Thu, 20 Sep 2018 15:42:04 -0400 Subject: [PATCH] Remove unnecessary sysroot and platform configuration from build script. --- ports/libsimpleservo/build.rs | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/ports/libsimpleservo/build.rs b/ports/libsimpleservo/build.rs index 8f7df1926d1..0ba96d6b7a8 100644 --- a/ports/libsimpleservo/build.rs +++ b/ports/libsimpleservo/build.rs @@ -24,36 +24,14 @@ fn android_main() { env::var_os("ANDROID_NDK").expect("Please set the ANDROID_NDK environment variable"); let ndk_path = Path::new(&ndk_path); - let target = env::var("TARGET").unwrap(); - let arch = if target.contains("arm") { - "arch-arm" - } else if target.contains("aarch64") { - "arch-arm64" - } else if target.contains("x86") || target.contains("i686") { - "arch-x86" - } else if target.contains("mips") { - "arch-mips" - } else { - panic!("Invalid target architecture {}", target); - }; - - let platform = if target.contains("aarch64") { - "android-21" - } else { - "android-18" - }; - // compiling android_native_app_glue.c let c_file = ndk_path .join("sources") .join("android") .join("native_app_glue") .join("android_native_app_glue.c"); - let sysroot = ndk_path.join("platforms").join(platform).join(arch); cc::Build::new() .file(c_file) - .flag("--sysroot") - .flag(sysroot.to_str().unwrap()) .warnings(false) .compile("android_native_app_glue");