aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-09-20 19:21:55 -0400
committerGitHub <noreply@github.com>2018-09-20 19:21:55 -0400
commit82bbf3ad457d51392357a303c5eb3a4d22e7c11b (patch)
treeb3db86b5ca6e2fc3892697e41b130708b2d3064b
parentfc0c191246e6c49947dc5d5dc0d2275709fe047e (diff)
parent9d52fb88abf3843c7db338120e9f518a1834f80f (diff)
downloadservo-82bbf3ad457d51392357a303c5eb3a4d22e7c11b.tar.gz
servo-82bbf3ad457d51392357a303c5eb3a4d22e7c11b.zip
Auto merge of #21769 - servo:jdm-patch-28, r=asajeffrey
Remove unnecessary sysroot and platform configuration from build script. All of the proper compiler arguments and paths are set up by mach ahead of time, so there should be no need to duplicate any of that logic in the build script. --- - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] There are tests for these changes <!-- 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/21769) <!-- Reviewable:end -->
-rw-r--r--ports/libsimpleservo/build.rs22
1 files changed, 0 insertions, 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");