diff options
Diffstat (limited to 'media')
| -rwxr-xr-x | media/libaom/generate_sources_mozbuild.sh | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/media/libaom/generate_sources_mozbuild.sh b/media/libaom/generate_sources_mozbuild.sh index a8c0ba83a3..f30e2e2533 100755 --- a/media/libaom/generate_sources_mozbuild.sh +++ b/media/libaom/generate_sources_mozbuild.sh @@ -29,24 +29,23 @@ function write_license { # The build does not support duplicate file names. function find_duplicates { local readonly duplicate_file_names=$(find \ - $BASE_DIR/$LIBAOM_SRC_DIR/vp8 \ - $BASE_DIR/$LIBAOM_SRC_DIR/vp9 \ - $BASE_DIR/$LIBAOM_SRC_DIR/av1 \ $BASE_DIR/$LIBAOM_SRC_DIR/aom \ $BASE_DIR/$LIBAOM_SRC_DIR/aom_dsp \ - -type f -name \*.c | xargs -I {} basename {} | sort | uniq -d \ + $BASE_DIR/$LIBAOM_SRC_DIR/av1 \ + -type f -name \*.c -o -name \*.asm | \ + xargs -I {} basename -s .c {} | \ + xargs -I {} basename -s .asm {} | \ + sort | uniq -d \ ) if [ -n "${duplicate_file_names}" ]; then echo "ERROR: DUPLICATE FILES FOUND" for file in ${duplicate_file_names}; do find \ - $BASE_DIR/$LIBAOM_SRC_DIR/vp8 \ - $BASE_DIR/$LIBAOM_SRC_DIR/vp9 \ - $BASE_DIR/$LIBAOM_SRC_DIR/av1 \ $BASE_DIR/$LIBAOM_SRC_DIR/aom \ $BASE_DIR/$LIBAOM_SRC_DIR/aom_dsp \ - -name $file + $BASE_DIR/$LIBAOM_SRC_DIR/av1 \ + -name $file\.* done exit 1 fi |