Reland "[data sharing] Refactor libs to not depend on factory"
This reverts commit 8ceca719d39f7acd2eb128d7ff802d5ffc831f81.
Reason for revert: rename target to refresh build cache. Build
failures are because the cached tab_group target depends back on
factory causing circular dep.
failed build:
https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket/8730632363171594961/+/u/Incremental_build_with_1-day_of_changes/Build_chrome_public_apk_with_remote_cache/stdout
it says tab_group_ui -> factory_java, but not the case in reality.
Original change's description:
> Revert "[data sharing] Refactor libs to not depend on factory"
>
> This reverts commit 1ed6d5393b19c4d98845399c32453e5cdc303959.
>
> Reason for revert: It seems that this CL introduced a dependency cycle, and Android builds are failing.
>
> Original change's description:
> > [data sharing] Refactor libs to not depend on factory
> >
> > Factory will construct delegates, root UI will get the services and pass
> > to the delegates. The tab manager will not depend on the factory, so
> > delegates can use this class. It gets initialized when profile is ready.
> > Rename messages_java to delegates_java.
> > Move message factory out of delegates target.
> >
> > Change-Id: Ia51afeb895c5e6e4575bde0645106d1fabfdea35
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6035940
> > Commit-Queue: Siddhartha S <[email protected]>
> > Reviewed-by: Calder Kitagawa <[email protected]>
> > Reviewed-by: Sky Malice <[email protected]>
> > Reviewed-by: Hailey Wang <[email protected]>
> > Code-Coverage: [email protected] <[email protected]>
> > Cr-Commit-Position: refs/heads/main@{#1386028}
>
> Change-Id: I2b78702d7849d5efa41082268d97aa9c898cb27e
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6042068
> Bot-Commit: Rubber Stamper <[email protected]>
> Reviewed-by: Calder Kitagawa <[email protected]>
> Commit-Queue: Scott Lee <[email protected]>
> Cr-Commit-Position: refs/heads/main@{#1386526}
Change-Id: Idff93b2b23e09b467330cba106b9868a1d97bf60
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6041451
Reviewed-by: Wenyu Fu <[email protected]>
Commit-Queue: Siddhartha S <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1386951}
diff --git a/chrome/browser/data_sharing/BUILD.gn b/chrome/browser/data_sharing/BUILD.gn
index e436fb6..e41adca 100644
--- a/chrome/browser/data_sharing/BUILD.gn
+++ b/chrome/browser/data_sharing/BUILD.gn
@@ -17,6 +17,7 @@
]
deps = [
+ ":internal_library_java",
":java",
"//base:base_java",
"//base:service_loader_java",
@@ -29,6 +30,20 @@
]
}
+ # TODO(crbug.com/380154734): Move this to collaboration/ directory near messages factory.
+ android_library("instant_message_delegate_factory_java") {
+ sources = [ "android/java/src/org/chromium/chrome/browser/data_sharing/InstantMessageDelegateFactory.java" ]
+
+ deps = [
+ ":factory_java",
+ ":internal_library_java",
+ "//base:base_java",
+ "//chrome/browser/profiles/android:java",
+ "//components/data_sharing/public:public_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ ]
+ }
+
android_resources("java_resources") {
sources = [
"android/java/res/drawable/round_image_filled.xml",
@@ -42,7 +57,7 @@
deps = [ "//components/browser_ui/styles/android:java_resources" ]
}
- android_library("tab_group_ui_java") {
+ android_library("data_sharing_public_java") {
resources_package = "org.chromium.chrome.browser.data_sharing"
sources = [
"android/java/src/org/chromium/chrome/browser/data_sharing/DataSharingMetrics.java",
@@ -53,7 +68,6 @@
]
deps = [
- ":factory_java",
":java_resources",
"//base:base_java",
"//chrome/browser/android/intents:java",
@@ -129,18 +143,18 @@
]
}
- android_library("messages_java") {
+ android_library("internal_library_java") {
resources_package = "org.chromium.chrome.browser.data_sharing"
sources = [
"android/java/src/org/chromium/chrome/browser/data_sharing/DataSharingNotificationManager.java",
"android/java/src/org/chromium/chrome/browser/data_sharing/DataSharingUiDelegateAndroid.java",
- "android/java/src/org/chromium/chrome/browser/data_sharing/InstantMessageDelegateFactory.java",
"android/java/src/org/chromium/chrome/browser/data_sharing/InstantMessageDelegateImpl.java",
]
deps = [
+ ":data_sharing_public_java",
+ ":java",
":java_resources",
- ":tab_group_ui_java",
"//base:base_java",
"//base:service_loader_java",
"//base:supplier_java",
@@ -191,10 +205,10 @@
"android/java/src/org/chromium/chrome/browser/data_sharing/ui/shared_image_tiles/SharedImageTilesCoordinatorUnitTest.java",
]
deps = [
+ ":data_sharing_public_java",
+ ":internal_library_java",
":java",
- ":messages_java",
":shared_image_tiles_java",
- ":tab_group_ui_java",
"//base:base_java",
"//base:base_junit_test_support",
"//chrome/browser/collaboration:messaging_factory_java",
