From 2f163b36eddf2e728e6292550c3c2e186f3df2bd Mon Sep 17 00:00:00 2001
From: Anshu Gupta <anshugupta@google.com>
Date: Thu, 23 Jul 2026 02:39:05 +0000
Subject: [PATCH] rdk, evergreen: clean up remaining dangling raspi references

- Remove broken reference to //starboard/raspi/shared/system_gles2.cc in starboard/contrib/rdk/src/third_party/starboard/rdk/shared/BUILD.gn.
- Delete deprecated evergreen-arm-hardfp-raspi package.
---
 .../evergreen-arm-hardfp-raspi/package.json   | 99 -------------------
 .../third_party/starboard/rdk/shared/BUILD.gn |  9 +-
 2 files changed, 1 insertion(+), 107 deletions(-)
 delete mode 100644 cobalt/build/evergreen-arm-hardfp-raspi/package.json

diff --git a/cobalt/build/evergreen-arm-hardfp-raspi/package.json b/cobalt/build/evergreen-arm-hardfp-raspi/package.json
deleted file mode 100644
index 536b20815fad..000000000000
--- a/cobalt/build/evergreen-arm-hardfp-raspi/package.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-    "archive_datas": [
-        {
-            "tar_paths": [
-                {
-                    "from_path": "lib.unstripped/libcobalt.so",
-                    "to_tar": "symbols/libcobalt.so.tar.gz"
-                }
-            ],
-            "files": [
-                "app/cobalt/lib/libcobalt.lz4",
-                "cobalt_shell.pak",
-                "fonts/fonts.xml",
-                "gen/build_info.json",
-                "gen/licenses_cobalt.spdx",
-                "gen/licenses_cobalt.txt",
-                "libcobalt.so",
-                "app/crash_sandbox/lib/libcrash_sandbox.lz4",
-                "app/noop_sandbox/lib/libnoop_sandbox.lz4",
-                "app/one_app_only_sandbox/lib/libone_app_only_sandbox.lz4",
-                "loader_app",
-                "native_target/crashpad_handler",
-                {
-                    "from_file": "cobalt_shell.pak",
-                    "to_file": "content/cobalt_shell.pak"
-                },
-                {
-                    "from_file": "libcobalt.so",
-                    "to_file": "lib/libcobalt.so"
-                }
-            ],
-            "rename_files": [
-                {
-                    "from_file": "app/cobalt/lib/libcobalt.lz4",
-                    "to_file": "lib/compressed/libcobalt.lz4"
-                },
-                {
-                    "from_file": "fonts/fonts.xml",
-                    "to_file": "content/fonts/fonts.xml"
-                },
-                {
-                    "from_file": "gen/build_info.json",
-                    "to_file": "build_info.json"
-                },
-                {
-                    "from_file": "gen/licenses_cobalt.spdx",
-                    "to_file": "licenses_cobalt.spdx"
-                },
-                {
-                    "from_file": "gen/licenses_cobalt.txt",
-                    "to_file": "licenses_cobalt.txt"
-                },
-                {
-                    "from_file": "app/crash_sandbox/lib/libcrash_sandbox.lz4",
-                    "to_file": "lib/test_apps/tcrash/libcobalt.lz4"
-                },
-                {
-                    "from_file": "app/noop_sandbox/lib/libnoop_sandbox.lz4",
-                    "to_file": "lib/test_apps/tnoop/libcobalt.lz4"
-                },
-                {
-                    "from_file": "app/one_app_only_sandbox/lib/libone_app_only_sandbox.lz4",
-                    "to_file": "lib/test_apps/t1app/libcobalt.lz4"
-                }
-            ],
-            "dirs": [
-                "app",
-                "fonts",
-                {
-                    "from_dir": "app/cobalt/content/ssl",
-                    "to_dir": "content/ssl"
-                }
-            ],
-            "archive_type": "ARCHIVE_TYPE_ZIP"
-        },
-        {
-            "files": [
-                "gen/build_info.json",
-                "gen/licenses_cobalt.spdx",
-                "gen/licenses_cobalt.txt"
-            ],
-            "rename_files": [
-                {
-                    "from_file": "gen/build_info.json",
-                    "to_file": "build_info.json"
-                },
-                {
-                    "from_file": "gen/licenses_cobalt.spdx",
-                    "to_file": "licenses_cobalt.spdx"
-                },
-                {
-                    "from_file": "gen/licenses_cobalt.txt",
-                    "to_file": "licenses_cobalt.txt"
-                }
-            ],
-            "archive_type": "ARCHIVE_TYPE_FILES"
-        }
-    ]
-}
diff --git a/starboard/contrib/rdk/src/third_party/starboard/rdk/shared/BUILD.gn b/starboard/contrib/rdk/src/third_party/starboard/rdk/shared/BUILD.gn
index 96c2aaac0a0a..f74e401b4ee6 100644
--- a/starboard/contrib/rdk/src/third_party/starboard/rdk/shared/BUILD.gn
+++ b/starboard/contrib/rdk/src/third_party/starboard/rdk/shared/BUILD.gn
@@ -296,14 +296,7 @@ static_library("starboard_platform_sources") {
     sources += [ "speech/speech_synthesis_is_supported_executable.cc", ]
   }
 
-  if (starboard_target_platform == "rdk-rpi") {
-    sources -= [
-      "//starboard/shared/gles/system_gles2.cc",
-    ]
-    sources += [
-      "//starboard/raspi/shared/system_gles2.cc",
-    ]
-  }
+
 
   if (final_executable_type == "shared_library" && !build_with_separate_cobalt_toolchain) {
     sources += [