From 76a14d6a6470fe6e290a11ae0954635710c19568 Mon Sep 17 00:00:00 2001 From: Bobby Holley Date: Wed, 18 Apr 2018 10:41:56 -0700 Subject: [PATCH] style: Switch stylo function signature checking to use generated bindings. Bug: 1451956 Reviewed-by: xidorn MozReview-Commit-ID: A7sWaD2PInN --- ports/geckolib/tests/build.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/geckolib/tests/build.rs b/ports/geckolib/tests/build.rs index ab21e2186cd..7feb9d10405 100644 --- a/ports/geckolib/tests/build.rs +++ b/ports/geckolib/tests/build.rs @@ -11,8 +11,11 @@ use std::io::{BufRead, BufReader, Write}; use std::path::Path; fn main() { + // https://github.com/rust-lang/cargo/issues/3544 + let style_out_dir = env::var_os("DEP_FOR SOME REASON THE LINKS KEY IS REQUIRED \ + TO PASS DATA AROUND BETWEEN BUILD SCRIPTS_OUT_DIR").unwrap(); let root_path = Path::new("../../../"); - let bindings_file = root_path.join("components/style/gecko/generated/bindings.rs"); + let bindings_file = Path::new(&style_out_dir).join("gecko/bindings.rs"); let glue_file = root_path.join("ports/geckolib/glue.rs"); println!("cargo:rerun-if-changed=build.rs"); @@ -70,9 +73,6 @@ fn main() { } } - // https://github.com/rust-lang/cargo/issues/3544 - let style_out_dir = env::var_os("DEP_FOR SOME REASON THE LINKS KEY IS REQUIRED \ - TO PASS DATA AROUND BETWEEN BUILD SCRIPTS_OUT_DIR").unwrap(); File::create(out_dir.join("bindings.rs")) .unwrap() .write_all(format!("include!(concat!({:?}, \"/gecko/structs.rs\"));",