Fix GN issues

youtube · May 16, 2024 · 67b2a6e · 67b2a6e
1 parent 8d8de60
commit 67b2a6e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/starboard/android/shared/platform_configuration/configuration.gni b/starboard/android/shared/platform_configuration/configuration.gni
@@ -23,7 +23,9 @@ gtest_target_type = "shared_library"
 starboard_level_final_executable_type = "shared_library"
 starboard_level_gtest_target_type = "shared_library"
 
-sb_enable_benchmark = true
+# TODO: libbenchmark.so is not built by evergreen.
+# Enabling it causes the EG AOSP build to fail due to it missing.
+sb_enable_benchmark = false
 
 size_config_path = "//starboard/android/shared/platform_configuration:size"
 speed_config_path = "//starboard/android/shared/platform_configuration:speed"

diff --git a/starboard/build/config/BUILDCONFIG.gn b/starboard/build/config/BUILDCONFIG.gn
@@ -615,7 +615,17 @@ template("shared_library") {
     }
 
     if (sb_is_evergreen_compatible && sb_evergreen_compatible_package &&
-        target_name != "loader_app") {
+        target_name != "loader_app" &&
+        # These are missing the corresponding lib.so file from eg-softfp.
+        target_name != "elf_loader_sys_sandbox" &&
+        target_name != "installation_manager_test" &&
+        target_name != "loader_app_sys" &&
+        target_name != "nplb_evergreen_compat_tests" &&
+        target_name != "player_filter_benchmarks" &&
+        # TODO: This one looks fishy.
+        target_name != "player_filter_tests" &&
+        target_name != "audio_dmp_player" &&
+        target_name != "reset_evergreen_update_test") {
       evergreen_loader(original_target_name + "_evergreen_loader") {
         forward_variables_from(invoker, "*")
       }