Remove unneeded dep in brave_generated_resources_grit.

Removes prior temporary fix for Android build.
brave · Mar 19, 2020 · c281afe · c281afe
1 parent f9d3dfd
commit c281afe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/app/BUILD.gn b/app/BUILD.gn
@@ -26,9 +26,6 @@ grit("brave_generated_resources_grit") {
     "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
   ]
 
-  deps = [
-    "//brave/components/services:brave_content_manifest_overlays",
-  ]
   resource_ids = "//brave/browser/resources/resource_ids"
 }
 

diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index dd59ffa4ffb9bd12d28e10aa64dc7dcfdabc0849..1cc0b8b79b4a1ed73598726cf25bcdf203f5500e 100644
+index dd59ffa4ffb9bd12d28e10aa64dc7dcfdabc0849..dd6cff83b144e5e7a572b97d883e4db6e8e302aa 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
 @@ -35,7 +35,7 @@ import("java_sources.gni")
@@ -43,15 +43,7 @@ index dd59ffa4ffb9bd12d28e10aa64dc7dcfdabc0849..1cc0b8b79b4a1ed73598726cf25bcdf2
  }
 
  action("chrome_android_java_google_api_keys_srcjar") {
-@@ -690,6 +694,7 @@ junit_binary("chrome_junit_tests") {
-   data_deps = [ "//testing/buildbot/filters:chrome_junit_tests_filters" ]
-
-   package_name = chrome_public_manifest_package
-+  assert_no_deps -= [ "//content", "//mojo/public/mojom/base", ]
- }
-
- process_version("chrome_version_constants") {
-@@ -1392,6 +1397,7 @@ if (current_toolchain == default_toolchain) {
+@@ -1392,6 +1396,7 @@ if (current_toolchain == default_toolchain) {
          ":${_variant}_locale_pak_assets",
          ":${_variant}_paks",
        ]