Fix assets being duplicated in DFMs when recursive_resource_deps is used

Assets were being kept in both the base module and DFM due to the
recursive_resource_deps arg which pulls resources into the base module.
This change excludes assets, preventing them from being duplicated in
the base module.

Bug: 1126301
Change-Id: I6dd110c86f5befb7271880fee0c5c2c94740a766
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2536750Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827133}

build/android/gyp/write_build_config.py

@@ -821,6 +821,11 @@ def _DepsFromPaths(dep_paths,
     # dependencies.
     if recursive_resource_deps:
       dep_paths = GetAllDepsConfigsInOrder(dep_paths)
+      # Exclude assets if recursive_resource_deps is set. The
+      # recursive_resource_deps arg is used to pull resources into the base
+      # module to workaround bugs accessing resources in isolated DFMs, but
+      # assets should be kept in the DFMs.
+      blocklist.append('android_assets')
 
   return _DepsFromPathsWithFilters(dep_paths, blocklist, allowlist)