Only add metadata to daemon when not testing

2 files changed, 10 insertions, 2 deletions

diff --git a/build.sh b/build.sh
index 0e18fc5be8..fe1d4687df 100755
--- a/build.sh
+++ b/build.sh
@@ -117,7 +117,7 @@ if [[ "$(uname -s)" == "MINGW"* ]]; then
 fi
 
 echo "Building Rust code in release mode using $RUSTC_VERSION..."
-cargo +stable build --release
+MULLVAD_ADD_MANIFEST="1" cargo +stable build --release
 
 ################################################################################
 # Other work to prepare the release.
diff --git a/mullvad-daemon/build.rs b/mullvad-daemon/build.rs
index e629f39232..f35e2fa4a1 100644
--- a/mullvad-daemon/build.rs
+++ b/mullvad-daemon/build.rs
@@ -24,7 +24,15 @@ fn main() {
             winapi::um::winnt::LANG_ENGLISH,
             winapi::um::winnt::SUBLANG_ENGLISH_US,
         ));
-        res.set_manifest_file("mullvad-daemon.manifest");
+        println!("cargo:rerun-if-env-changed=MULLVAD_ADD_MANIFEST");
+        if env::var("MULLVAD_ADD_MANIFEST")
+            .map(|s| s != "0")
+            .unwrap_or(false)
+        {
+            res.set_manifest_file("mullvad-daemon.manifest");
+        } else {
+            println!("cargo:warning=Skipping mullvad-daemon manifest");
+        }
         res.compile().expect("Unable to generate windows resources");
     }
 }