Revert java sources to master

brave · Dec 10, 2024 · e37e4b3 · e37e4b3
1 parent 5f0be59
commit e37e4b3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni
@@ -295,6 +295,14 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/partnercustomizations/CloseBraveManager.java",
   "../../brave/android/java/org/chromium/chrome/browser/password_manager/settings/BraveExportFlow.java",
   "../../brave/android/java/org/chromium/chrome/browser/password_manager/settings/BravePasswordSettingsBase.java",
+  "../../brave/android/java/org/chromium/chrome/browser/playlist/PlaylistHostActivity.java",
+  "../../brave/android/java/org/chromium/chrome/browser/playlist/PlaylistServiceFactoryAndroid.java",
+  "../../brave/android/java/org/chromium/chrome/browser/playlist/PlaylistServiceObserverImpl.java",
+  "../../brave/android/java/org/chromium/chrome/browser/playlist/PlaylistStreamingObserverImpl.java",
+  "../../brave/android/java/org/chromium/chrome/browser/playlist/hls_content/HlsServiceImpl.java",
+  "../../brave/android/java/org/chromium/chrome/browser/playlist/hls_content/HlsUtils.java",
+  "../../brave/android/java/org/chromium/chrome/browser/playlist/settings/BravePlaylistPreferences.java",
+  "../../brave/android/java/org/chromium/chrome/browser/playlist/settings/BravePlaylistResetPreference.java",
   "../../brave/android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java",
   "../../brave/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java",
   "../../brave/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettingsObserver.java",
@@ -541,12 +549,11 @@ brave_java_base_sources = [
 
 brave_java_base_module_sources = [
   "//brave/android/java/org/chromium/chrome/browser/base/SplitCompatJobIntentService.java",
+  "//brave/android/java/org/chromium/chrome/browser/playlist/hls_content/HlsService.java",
   "//brave/android/java/org/chromium/chrome/browser/upgrade/BraveUpgradeJobIntentService.java",
   "//brave/android/java/org/chromium/chrome/browser/vpn/wireguard/WireguardService.java",
 ]
 
-brave_java_base_module_sources += brave_java_base_module_playlist_sources
-
 brave_java_base_module_deps = [
   "//brave/third_party/android_deps:com_wireguard_android_java",
   "//third_party/androidx:androidx_core_core_java",

diff --git a/android/java/org/chromium/chrome/browser/playlist/sources.gni b/android/java/org/chromium/chrome/browser/playlist/sources.gni
@@ -7,16 +7,3 @@ brave_app_playlist_deps = [
   "//brave/third_party/android_deps:androidx_media3_media3_exoplayer_hls_java",
   "//third_party/androidx:androidx_media3_media3_common_java",
 ]
-
-brave_playlist_sources = [
-  "../../brave/android/java/org/chromium/chrome/browser/playlist/PlaylistHostActivity.java",
-  "../../brave/android/java/org/chromium/chrome/browser/playlist/PlaylistServiceFactoryAndroid.java",
-  "../../brave/android/java/org/chromium/chrome/browser/playlist/PlaylistServiceObserverImpl.java",
-  "../../brave/android/java/org/chromium/chrome/browser/playlist/PlaylistStreamingObserverImpl.java",
-  "../../brave/android/java/org/chromium/chrome/browser/playlist/hls_content/HlsServiceImpl.java",
-  "../../brave/android/java/org/chromium/chrome/browser/playlist/hls_content/HlsUtils.java",
-  "../../brave/android/java/org/chromium/chrome/browser/playlist/settings/BravePlaylistPreferences.java",
-  "../../brave/android/java/org/chromium/chrome/browser/playlist/settings/BravePlaylistResetPreference.java",
-]
-
-brave_java_base_module_playlist_sources = [ "//brave/android/java/org/chromium/chrome/browser/playlist/hls_content/HlsService.java" ]