aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzijunzhao <zijunzhao@google.com>2023-07-01 00:38:10 +0000
committerZijun Zhao <zijunzhao@google.com>2023-07-20 20:55:28 +0000
commit19b288b3c8e9a310f6fb5d3b48c5a62122950861 (patch)
tree07a20995e6cd8a9e50856ba3de6fbdf6dfcf7992
parenta3a652d3d73bb8b135c4c9d9e33541f130f984a3 (diff)
downloadsquashfs-tools-19b288b3c8e9a310f6fb5d3b48c5a62122950861.tar.gz
Fix duplicate symbols error in external/squashfs-tools
Two symbols bwriter_buffer and fwriter_buffer are duplicated when switch -fcommon to -fno-common. Keep the old default for this project until we get a fixed version from upstream. Upstream fix patch: https://github.com/plougher/squashfs-tools/commit/fe2f5da4b0f8994169c53e84b7cb8a0feefc97b5 Bug: b/151457797 Test: mm Change-Id: Ia233a947c217ba79129c576259594d9ec01f477a
-rw-r--r--squashfs-tools/Android.bp1
1 files changed, 1 insertions, 0 deletions
diff --git a/squashfs-tools/Android.bp b/squashfs-tools/Android.bp
index 6431f54..95985fa 100644
--- a/squashfs-tools/Android.bp
+++ b/squashfs-tools/Android.bp
@@ -37,6 +37,7 @@ cc_defaults {
"-DZSTD_SUPPORT",
"-DXATTR_SUPPORT",
"-DXATTR_DEFAULT",
+ "-fcommon",
"-Wno-unused-parameter",
"-Wno-sign-compare",
"-Wno-pointer-arith",