Make android builds pass with is_cobalt = false

youtube · Oct 25, 2024 · e6f48fb · e6f48fb
1 parent 13b2675
commit e6f48fb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/build/build_config.h b/build/build_config.h
@@ -266,6 +266,11 @@
 #define BUILDFLAG_INTERNAL_USE_STARBOARD() (0)
 #endif
 
+#if defined(USE_STARBOARD_MEDIA)
+#define BUILDFLAG_INTERNAL_USE_STARBOARD_MEDIA() (1)
+#else
+#define BUILDFLAG_INTERNAL_USE_STARBOARD_MEDIA() (0)
+#endif
 // Compiler detection. Note: clang masquerades as GCC on POSIX and as MSVC on
 // Windows.
 #if defined(__GNUC__)

diff --git a/third_party/blink/renderer/modules/mediasource/media_source.cc b/third_party/blink/renderer/modules/mediasource/media_source.cc
@@ -20,8 +20,9 @@
 #include "media/base/supported_types.h"
 #include "media/base/video_decoder_config.h"
 #include "media/media_buildflags.h"
-// For BUILDFLAG(USE_STARBOARD_MEDIA)
+#if defined(IS_COBALT)
 #include "starboard/build/starboard_buildflags.h"
+#endif
 #include "third_party/blink/public/common/privacy_budget/identifiability_metric_builder.h"
 #include "third_party/blink/public/common/privacy_budget/identifiability_study_settings.h"
 #include "third_party/blink/public/common/privacy_budget/identifiable_surface.h"

diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
@@ -66,7 +66,9 @@
 #include "net/base/data_url.h"
 #include "services/device/public/mojom/battery_monitor.mojom-blink.h"
 // For BUILDFLAG(USE_STARBOARD_MEDIA)
+#if defined(IS_COBALT)
 #include "starboard/build/starboard_buildflags.h"
+#endif
 #include "third_party/blink/public/common/media/display_type.h"
 #include "third_party/blink/public/common/media/watch_time_reporter.h"
 #include "third_party/blink/public/common/thread_safe_browser_interface_broker_proxy.h"