From 3d6accbbe3a33ea5e3c621ae3c291a0f35fcba73 Mon Sep 17 00:00:00 2001
From: Jonathan Schwender <55576758+jschwe@users.noreply.github.com>
Date: Thu, 20 Jun 2024 10:50:15 +0200
Subject: [PATCH] android: Remove serde-json build-dependency (#32573)

There is no need to add `serde-json` as a
build-dependency (which causes serde to be built
twice when cross-compiling - once for host and once
for the target)

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
---
 ports/servoshell/Cargo.toml                 | 2 --
 ports/servoshell/build.rs                   | 9 +--------
 ports/servoshell/egl/android/simpleservo.rs | 2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/ports/servoshell/Cargo.toml b/ports/servoshell/Cargo.toml
index 2dbcb8b1a5d..33c5fa32d5c 100644
--- a/ports/servoshell/Cargo.toml
+++ b/ports/servoshell/Cargo.toml
@@ -24,8 +24,6 @@ bench = false
 vergen = { version = "8.3.1", features = ["git", "git2"] }
 # Android and OpenHarmony
 gl_generator = "0.14"
-# Android only
-serde_json = { workspace = true }
 # MacOS only
 cc = "1.0"
 
diff --git a/ports/servoshell/build.rs b/ports/servoshell/build.rs
index c9e6ebf5545..f226f2094b7 100644
--- a/ports/servoshell/build.rs
+++ b/ports/servoshell/build.rs
@@ -5,10 +5,9 @@
 use std::error::Error;
 use std::fs::File;
 use std::io::Write;
-use std::path::{Path, PathBuf};
+use std::path::Path;
 
 use gl_generator::{Api, Fallbacks, Profile, Registry};
-use serde_json::Value;
 use vergen::EmitBuilder;
 
 fn main() -> Result<(), Box<dyn Error>> {
@@ -60,12 +59,6 @@ fn main() -> Result<(), Box<dyn Error>> {
         let mut libgcc = File::create(out.join("libgcc.a")).unwrap();
         libgcc.write_all(b"INPUT(-lunwind)").unwrap();
         println!("cargo:rustc-link-search=native={}", out.display());
-
-        let mut default_prefs = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-        default_prefs.push("../../resources/prefs.json");
-        let prefs: Value = serde_json::from_reader(File::open(&default_prefs).unwrap()).unwrap();
-        let file = File::create(out.join("prefs.json")).unwrap();
-        serde_json::to_writer(file, &prefs).unwrap();
     }
 
     if let Err(error) = EmitBuilder::builder()
diff --git a/ports/servoshell/egl/android/simpleservo.rs b/ports/servoshell/egl/android/simpleservo.rs
index db78877e57e..ff298719bef 100644
--- a/ports/servoshell/egl/android/simpleservo.rs
+++ b/ports/servoshell/egl/android/simpleservo.rs
@@ -916,7 +916,7 @@ impl ResourceReaderInstance {
 impl ResourceReaderMethods for ResourceReaderInstance {
     fn read(&self, res: Resource) -> Vec<u8> {
         Vec::from(match res {
-            Resource::Preferences => &include_bytes!(concat!(env!("OUT_DIR"), "/prefs.json"))[..],
+            Resource::Preferences => &include_bytes!("../../../../resources/prefs.json")[..],
             Resource::HstsPreloadList => {
                 &include_bytes!("../../../../resources/hsts_preload.json")[..]
             },