[Android] Use assert_no_deps to ensure java and native trees do not connect
Chromium change: https://source.chromium.org/chromium/chromium/src/+/99b60d792644f4589bdc400aa62244791ad8254e Reland "Android: Use assert_no_deps to ensure java and native trees do not connect" This reverts commit b46fadd958b824bb6e3cedbf3c2415d6bec3b5f6. Reason for reland: Added missing deps Original change's description: > Revert "Android: Use assert_no_deps to ensure java and native trees do not connect" > > This reverts commit c6ebc3f815d64748a9eabd3a4fb05afb91f6b8d9. > > Reason for revert: only suspect for build breakage, see https://crbug.com/327241558 > > Original change's description: > > Android: Use assert_no_deps to ensure java and native trees do not connect > > > > Our java and native build graphs are meant to be independent, but > > sometimes deps are added between them. The deps do not do anything, but > > slow down builds by reducing parallelism. These checks should prevent > > such deps from being introduced. > > > > To achieve this parallelism, adds an "asset_deps" field to android_apk > > and android_bundle_module targets that enable adding deps directly to > > the "package_apk" step. This was needed for > > libchrome_unwind_table_assets and loadable_modules. > > > > Bug: 325619950 > > Change-Id: I36c8cd3757650249e3d544310208825882dcad4d > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5301510 > > Reviewed-by: Peter Wen <wnwen@chromium.org> > > Auto-Submit: Andrew Grieve <agrieve@chromium.org> > > Commit-Queue: Andrew Grieve <agrieve@chromium.org> > > Cr-Commit-Position: refs/heads/main@{#1265824} > > Bug: 325619950 > Change-Id: I5e57dceb230cfd18a59be04c9df33e3a1e3ecc43 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5328880 > Owners-Override: John Abd-El-Malek <jam@chromium.org> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Reviewed-by: John Abd-El-Malek <jam@chromium.org> > Commit-Queue: John Abd-El-Malek <jam@chromium.org> > Cr-Commit-Position: refs/heads/main@{#1266034} Bug: 325619950
This commit is contained in:
@@ -30,7 +30,6 @@ android_library("java") {
|
||||
"//base:base_shared_preferences_java",
|
||||
"//brave/android/java/org/chromium/chrome/browser/search_engines:java",
|
||||
"//brave/build/android:android_brave_strings_grd",
|
||||
"//brave/components/p3a_utils",
|
||||
"//chrome/browser/commerce/merchant_viewer/android:java",
|
||||
"//chrome/browser/flags:java",
|
||||
"//chrome/browser/preferences:java",
|
||||
|
||||
@@ -1248,7 +1248,6 @@ if (is_android) {
|
||||
"//base:base_shared_preferences_java",
|
||||
"//brave/components/brave_wallet/common:mojom_java",
|
||||
"//cc:cc_java",
|
||||
"//chrome/android:chrome_apk_pak_assets",
|
||||
"//chrome/browser/android/browserservices/intents:java",
|
||||
"//chrome/browser/android/lifecycle:java",
|
||||
"//chrome/browser/back_press/android:java",
|
||||
|
||||
Reference in New Issue
Block a user