diff options
| author | Yifan Hong <elsk@google.com> | 2022-10-12 16:13:18 -0700 |
|---|---|---|
| committer | Yifan Hong <elsk@google.com> | 2022-10-12 16:34:30 -0700 |
| commit | 2269b53c6b7d8b32a680b4bee8b80f82db119708 (patch) | |
| tree | e81b8b2d3e1b0e061d683cd8282acbc6db53213d | |
| parent | 28bec492db207f403d08d88886f86dd1e2984089 (diff) | |
| download | build-2269b53c6b7d8b32a680b4bee8b80f82db119708.tar.gz | |
kleaf: unstripped modules archive allow collisions.
Collisions are unavoidable with GKI modules, because
both the unstripped dir from GKI modules and
the dir from device modules contains the device-built
GKI modules (e.g. slider builds zsmalloc). Hence,
just allow collisions.
Test: build slider_unstripped_modules_archive
Bug: 228557644
Bug: 253309286
Change-Id: Ia90a59a110ac80860ae47fb895cce6a03c76c929
| -rw-r--r-- | kleaf/impl/kernel_unstripped_modules_archive.bzl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kleaf/impl/kernel_unstripped_modules_archive.bzl b/kleaf/impl/kernel_unstripped_modules_archive.bzl index cf855b56..e7b3950b 100644 --- a/kleaf/impl/kernel_unstripped_modules_archive.bzl +++ b/kleaf/impl/kernel_unstripped_modules_archive.bzl @@ -26,7 +26,6 @@ def _kernel_unstripped_modules_archive_impl(ctx): # Early elements = higher priority. In-tree modules from base_kernel has highest priority, # then in-tree modules of the device kernel_build, then external modules (in an undetermined # order). - # TODO(b/228557644): kernel module names should not collide. Detect collsions. srcs = [] for kernel_build_object in (base_kernel, kernel_build): if not kernel_build_object: @@ -53,7 +52,7 @@ def _kernel_unstripped_modules_archive_impl(ctx): for src in reversed(srcs): # src could be empty, so use find + cp command += """ - find {src} -name '*.ko' -exec cp -l -t {unstripped_dir} {{}} + + find {src} -name '*.ko' -exec cp -f -l -t {unstripped_dir} {{}} + """.format( src = src.path, unstripped_dir = unstripped_dir, |