Fix component build when enable_chrome_module is true

Component build uses cr.so libraries for DFMs instead of partitions.
These will just be included as shared libraries in the base module.

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

chrome/android/chrome_public_apk_tmpl.gni

@@ -439,8 +439,14 @@ template("monochrome_public_common_apk_or_module_tmpl") {
       if (defined(_module_desc.native_deps) && _module_desc.native_deps != []) {
         _lib_target = "//chrome/android:${_base_target_name}_${_module_desc.name}${_toolchain}"
         _chrome_module_shared_lib_deps += [ _lib_target ]
-        _lib_out_dir = get_label_info(_lib_target, "root_out_dir")
-        _chrome_module_loadable_modules += [ "${_lib_out_dir}/${_base_target_name}_${_module_desc.name}_partition.so" ]
+
+        # In component builds, native libraries from DFMs are not in partitions,
+        # so include them as normal shared libraries instead of loadable
+        # modules.
+        if (!is_component_build) {
+          _lib_out_dir = get_label_info(_lib_target, "root_out_dir")
+          _chrome_module_loadable_modules += [ "${_lib_out_dir}/${_base_target_name}_${_module_desc.name}_partition.so" ]
+        }
       }
     }
   }
@@ -535,7 +541,11 @@ template("monochrome_public_common_apk_or_module_tmpl") {
           deps += [ "//chrome/android:base_module_java" ]
         }
         deps += [ ":${target_name}__all_chrome_resources" ]
-        deps += _chrome_module_shared_lib_deps
+        if (is_component_build) {
+          shared_libraries += _chrome_module_shared_lib_deps
+        } else {
+          deps += _chrome_module_shared_lib_deps
+        }
         _loadable_modules_32_bit = []
         _loadable_modules_64_bit = []
         foreach(_module_desc, _module_descs) {