diff options
| author | Jiyong Park <jiyong@google.com> | 2024-05-01 00:00:10 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2024-05-01 00:00:10 +0900 |
| commit | cbb689c715e9c09f371185d6ab23bb2bbd2df13f (patch) | |
| tree | e781f8f89efe85f64739cfcadb1fb20ce9292584 | |
| parent | 1cbabb3896166edd842214700caab6618b8dff0f (diff) | |
| download | development-cbb689c715e9c09f371185d6ab23bb2bbd2df13f.tar.gz | |
Don't include linux_bionic variants to platform-tools
platform-tools has been gathering both linux_glibc and linux_bionic
variants of the same module. However, due to b/335506668, the conflict
has been silently resolved by taking the first variant, which
fortunately(?) was linux_glibc.
As the bug is fixed, the gathering of linux_bionic variant is triggering
an error below:
error: development/build/Android.bp:187:1: module "platform-tools" variant "linux_bionic_common": packaging conflict at bin/make_f2fs_casefold:
out/soong/.intermediates/external/f2fs-tools/make_f2fs_casefold/linux_glibc_x86_64/make_f2fs_casefold
out/soong/.intermediates/external/f2fs-tools/make_f2fs_casefold/linux_bionic_x86_64/make_f2fs_casefold
Fix this by explicitly disabling the unnecessary linux_bionic variant.
Bug: 335506668
Test: build mainline_modules_sdks
Change-Id: I6c12c197301802fd792a6919f563ed7377dea551
| -rw-r--r-- | build/Android.bp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/build/Android.bp b/build/Android.bp index 9c3d0e899..f54346ff1 100644 --- a/build/Android.bp +++ b/build/Android.bp @@ -214,6 +214,9 @@ android_sdk_repo_host { linux: { strip_files: ["lib64/*.so"], }, + linux_bionic: { + enabled: false, + }, darwin: { strip_files: ["lib64/*.dylib"], }, |