flac - OpenGrok history log for /aosp_15

Revision	Date	Author	Comments (<<< Hide modified files) (Show modified files >>>)
600f14f4	29-Apr-2024	Xin Li <[email protected]>	[automerger skipped] Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future am: 3904d9c7a5 -s ours am skip reason: Merged-In Ic6934c70e22cf1a2255d745a91193d531ea34a22 with SHA-1 a13cf [automerger skipped] Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future am: 3904d9c7a5 -s ours am skip reason: Merged-In Ic6934c70e22cf1a2255d745a91193d531ea34a22 with SHA-1 a13cf69c96 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/flac/+/27145258 Change-Id: Ica7ac16e1b73d330cc6e7f7deee133ca8e036955 Signed-off-by: Automerger Merge Worker <[email protected]> show more ... .clang-format .github/workflows/action.yml .github/workflows/cifuzz.yml .github/workflows/distcheck.yml .github/workflows/options.yml .gitignore .gitlab-ci.yml .travis.yml AUTHORS Android.bp CHANGELOG.md CMakeLists.txt CONTRIBUTING.md COPYING.FDL COPYING.GPL COPYING.LGPL COPYING.Xiph METADATA MODULE_LICENSE_BSD_LIKE Makefile.am NOTICE OWNERS PREUPLOAD.cfg README.md autogen.sh cmake/CheckA64NEON.c.in cmake/CheckA64NEON.cmake cmake/CheckCPUArch.c.in cmake/CheckCPUArch.cmake cmake/FindOgg.cmake cmake/UseSystemExtensions.cmake config.cmake.h.in config.h configure.ac doc/CMakeLists.txt doc/Doxyfile.in doc/Makefile.am doc/doxygen.footer.html doc/images/Makefile.am doc/images/logo.svg doc/images/logo130.gif doc/isoflac.txt doc/release_checklist.md examples/CMakeLists.txt examples/Makefile.am examples/README examples/c/Makefile.am examples/c/decode/Makefile.am examples/c/decode/file/CMakeLists.txt examples/c/decode/file/Makefile.am examples/c/decode/file/main.c examples/c/encode/Makefile.am examples/c/encode/file/CMakeLists.txt examples/c/encode/file/Makefile.am examples/c/encode/file/main.c examples/cpp/Makefile.am examples/cpp/decode/Makefile.am examples/cpp/decode/file/CMakeLists.txt examples/cpp/decode/file/Makefile.am examples/cpp/decode/file/main.cpp examples/cpp/encode/Makefile.am examples/cpp/encode/file/CMakeLists.txt examples/cpp/encode/file/Makefile.am examples/cpp/encode/file/main.cpp flac-config.cmake.in fuzzer/Android.bp fuzzer/README.md fuzzer/flac_dec_fuzzer.cpp fuzzer/flac_dec_fuzzer.dict fuzzer/flac_enc_fuzzer.cpp include/FLAC++/Makefile.am include/FLAC++/all.h include/FLAC++/decoder.h include/FLAC++/encoder.h include/FLAC++/export.h include/FLAC++/metadata.h include/FLAC/Makefile.am include/FLAC/all.h include/FLAC/assert.h include/FLAC/callback.h include/FLAC/export.h include/FLAC/format.h include/FLAC/metadata.h include/FLAC/ordinals.h include/FLAC/stream_decoder.h include/FLAC/stream_encoder.h include/Makefile.am include/share/Makefile.am include/share/alloc.h include/share/compat.h include/share/endswap.h include/share/getopt.h include/share/grabbag.h include/share/grabbag/Makefile.am include/share/grabbag/cuesheet.h include/share/grabbag/file.h include/share/grabbag/picture.h include/share/grabbag/replaygain.h include/share/grabbag/seektable.h include/share/macros.h include/share/private.h include/share/replaygain_analysis.h include/share/replaygain_synthesis.h include/share/safe_str.h include/share/utf8.h include/share/win_utf8_io.h include/test_libs_common/Makefile.am include/test_libs_common/file_utils_flac.h include/test_libs_common/metadata_utils.h m4/Makefile.am m4/add_cflags.m4 m4/add_cxxflags.m4 m4/ax_add_fortify_source.m4 m4/ax_check_compile_flag.m4 m4/ax_check_enable_debug.m4 m4/bswap.m4 m4/c_attribute.m4 m4/clang.m4 m4/codeset.m4 m4/endian.m4 m4/gcc_version.m4 m4/iconv.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/ogg.m4 m4/really_gcc.m4 m4/stack_protect.m4 man/Makefile.am man/flac.md man/metaflac.md microbench/CMakeLists.txt microbench/Makefile.am microbench/benchmark_residual.c microbench/util.c microbench/util.h oss-fuzz/Makefile.am oss-fuzz/Readme.md oss-fuzz/common.h oss-fuzz/decoder.cc oss-fuzz/empty.cc oss-fuzz/encoder.cc oss-fuzz/encoder_v2.cc oss-fuzz/fuzzer_decoder.dict oss-fuzz/fuzzer_encoder.dict oss-fuzz/fuzzer_reencoder.dict oss-fuzz/fuzzer_tool_flac.dict oss-fuzz/fuzzing/datasource/datasource.hpp oss-fuzz/fuzzing/datasource/id.hpp oss-fuzz/fuzzing/exception.hpp oss-fuzz/fuzzing/memory.hpp oss-fuzz/fuzzing/types.hpp oss-fuzz/metadata.cc oss-fuzz/reencoder.cc oss-fuzz/seedcorpus/fuzzer_tool_flac/aiff-with-foreign-metadata-8bps.fuzz oss-fuzz/seedcorpus/fuzzer_tool_flac/flac-foreign-metadata-aiff-8bps.fuzz oss-fuzz/seedcorpus/fuzzer_tool_flac/flac-foreign-metadata-wav-8bps.fuzz oss-fuzz/seedcorpus/fuzzer_tool_flac/replaygain-which-is-not-lossless-ogg.fuzz oss-fuzz/seedcorpus/fuzzer_tool_flac/replaygain-which-is-not-lossless.fuzz oss-fuzz/seedcorpus/fuzzer_tool_flac/wav-with-foreign-metadata-8bps.fuzz oss-fuzz/seek.cc oss-fuzz/tool_flac.c oss-fuzz/tool_metaflac.c src/CMakeLists.txt src/Makefile.am src/flac/CMakeLists.txt src/flac/Makefile.am src/flac/analyze.c src/flac/analyze.h src/flac/decode.c src/flac/decode.h src/flac/encode.c src/flac/encode.h src/flac/foreign_metadata.c src/flac/foreign_metadata.h src/flac/iffscan.c src/flac/local_string_utils.c src/flac/local_string_utils.h src/flac/main.c src/flac/utils.c src/flac/utils.h src/flac/version.rc src/flac/vorbiscomment.c src/flac/vorbiscomment.h src/libFLAC++/CMakeLists.txt src/libFLAC++/Makefile.am src/libFLAC++/flac++.pc.in src/libFLAC++/libFLAC++.m4 src/libFLAC++/metadata.cpp src/libFLAC++/stream_decoder.cpp src/libFLAC++/stream_encoder.cpp src/libFLAC++/version.rc src/libFLAC/Android.bp src/libFLAC/CMakeLists.txt src/libFLAC/MODULE_LICENSE_BSD_LIKE src/libFLAC/Makefile.am src/libFLAC/bitmath.c src/libFLAC/bitreader.c src/libFLAC/bitwriter.c src/libFLAC/cpu.c src/libFLAC/crc.c src/libFLAC/deduplication/bitreader_read_rice_signed_block.c src/libFLAC/deduplication/lpc_compute_autocorrelation_intrin.c src/libFLAC/deduplication/lpc_compute_autocorrelation_intrin_neon.c src/libFLAC/deduplication/lpc_compute_autocorrelation_intrin_sse2.c src/libFLAC/fixed.c src/libFLAC/fixed_intrin_avx2.c src/libFLAC/fixed_intrin_sse2.c src/libFLAC/fixed_intrin_sse42.c src/libFLAC/fixed_intrin_ssse3.c src/libFLAC/flac.pc.in src/libFLAC/float.c src/libFLAC/format.c src/libFLAC/include/Makefile.am src/libFLAC/include/private/Makefile.am src/libFLAC/include/private/all.h src/libFLAC/include/private/bitmath.h src/libFLAC/include/private/bitreader.h src/libFLAC/include/private/bitwriter.h src/libFLAC/include/private/cpu.h src/libFLAC/include/private/crc.h src/libFLAC/include/private/fixed.h src/libFLAC/include/private/float.h src/libFLAC/include/private/format.h src/libFLAC/include/private/lpc.h src/libFLAC/include/private/macros.h src/libFLAC/include/private/md5.h src/libFLAC/include/private/memory.h src/libFLAC/include/private/metadata.h src/libFLAC/include/private/ogg_decoder_aspect.h src/libFLAC/include/private/ogg_encoder_aspect.h src/libFLAC/include/private/ogg_helper.h src/libFLAC/include/private/ogg_mapping.h src/libFLAC/include/private/stream_encoder.h src/libFLAC/include/private/stream_encoder_framing.h src/libFLAC/include/private/window.h src/libFLAC/include/protected/Makefile.am src/libFLAC/include/protected/all.h src/libFLAC/include/protected/stream_decoder.h src/libFLAC/include/protected/stream_encoder.h src/libFLAC/libFLAC.m4 src/libFLAC/libFLAC_blocklist.txt src/libFLAC/lpc.c src/libFLAC/lpc_intrin_avx2.c src/libFLAC/lpc_intrin_fma.c src/libFLAC/lpc_intrin_neon.c src/libFLAC/lpc_intrin_sse2.c src/libFLAC/lpc_intrin_sse41.c src/libFLAC/md5.c src/libFLAC/memory.c src/libFLAC/metadata_iterators.c src/libFLAC/metadata_object.c src/libFLAC/ogg_decoder_aspect.c src/libFLAC/ogg_encoder_aspect.c src/libFLAC/ogg_helper.c src/libFLAC/ogg_mapping.c src/libFLAC/stream_decoder.c src/libFLAC/stream_encoder.c src/libFLAC/stream_encoder_framing.c src/libFLAC/stream_encoder_intrin_avx2.c src/libFLAC/stream_encoder_intrin_sse2.c src/libFLAC/stream_encoder_intrin_ssse3.c src/libFLAC/version.rc src/libFLAC/window.c src/metaflac/CMakeLists.txt src/metaflac/Makefile.am src/metaflac/main.c src/metaflac/operations.c src/metaflac/operations.h src/metaflac/operations_shorthand.h src/metaflac/operations_shorthand_cuesheet.c src/metaflac/operations_shorthand_picture.c src/metaflac/operations_shorthand_seektable.c src/metaflac/operations_shorthand_streaminfo.c src/metaflac/operations_shorthand_vorbiscomment.c src/metaflac/options.c src/metaflac/options.h src/metaflac/usage.c src/metaflac/usage.h src/metaflac/utils.c src/metaflac/utils.h src/metaflac/version.rc src/share/Makefile.am src/share/README src/share/getopt/CMakeLists.txt src/share/getopt/getopt.c src/share/getopt/getopt1.c src/share/grabbag/CMakeLists.txt src/share/grabbag/alloc.c src/share/grabbag/cuesheet.c src/share/grabbag/file.c src/share/grabbag/picture.c src/share/grabbag/replaygain.c src/share/grabbag/seektable.c src/share/grabbag/snprintf.c src/share/replaygain_analysis/CMakeLists.txt src/share/replaygain_analysis/replaygain_analysis.c src/share/replaygain_synthesis/CMakeLists.txt src/share/replaygain_synthesis/replaygain_synthesis.c src/share/utf8/CMakeLists.txt src/share/utf8/charmaps.h src/share/utf8/charset.c src/share/utf8/charset.h src/share/utf8/charset_test.c src/share/utf8/iconvert.c src/share/utf8/iconvert.h src/share/utf8/makemap.c src/share/utf8/utf8.c src/share/win_utf8_io/win_utf8_io.c src/test_grabbag/CMakeLists.txt src/test_grabbag/Makefile.am src/test_grabbag/cuesheet/CMakeLists.txt src/test_grabbag/cuesheet/Makefile.am src/test_grabbag/cuesheet/main.c src/test_grabbag/picture/CMakeLists.txt src/test_grabbag/picture/Makefile.am src/test_grabbag/picture/main.c src/test_libFLAC++/CMakeLists.txt src/test_libFLAC++/Makefile.am src/test_libFLAC++/decoders.cpp src/test_libFLAC++/decoders.h src/test_libFLAC++/encoders.cpp src/test_libFLAC++/encoders.h src/test_libFLAC++/main.cpp src/test_libFLAC++/metadata.cpp src/test_libFLAC++/metadata.h src/test_libFLAC++/metadata_manip.cpp src/test_libFLAC++/metadata_object.cpp src/test_libFLAC/CMakeLists.txt src/test_libFLAC/Makefile.am src/test_libFLAC/bitreader.c src/test_libFLAC/bitreader.h src/test_libFLAC/bitwriter.c src/test_libFLAC/bitwriter.h src/test_libFLAC/crc.c src/test_libFLAC/crc.h src/test_libFLAC/decoders.c src/test_libFLAC/decoders.h src/test_libFLAC/encoders.c src/test_libFLAC/encoders.h src/test_libFLAC/endswap.c src/test_libFLAC/endswap.h src/test_libFLAC/format.c src/test_libFLAC/format.h src/test_libFLAC/main.c src/test_libFLAC/matrix src/test_libFLAC/md5.c src/test_libFLAC/md5.h src/test_libFLAC/metadata.c src/test_libFLAC/metadata.h src/test_libFLAC/metadata_manip.c src/test_libFLAC/metadata_object.c src/test_libs_common/CMakeLists.txt src/test_libs_common/Makefile.am src/test_libs_common/README src/test_libs_common/file_utils_flac.c src/test_libs_common/metadata_utils.c src/test_seeking/CMakeLists.txt src/test_seeking/Makefile.am src/test_seeking/main.c src/test_streams/CMakeLists.txt src/test_streams/Makefile.am src/test_streams/main.c src/utils/Makefile.am src/utils/flacdiff/CMakeLists.txt src/utils/flacdiff/Makefile.am src/utils/flacdiff/main.cpp src/utils/flactimer/CMakeLists.txt src/utils/flactimer/Makefile.am src/utils/flactimer/main.cpp src/utils/loudness/loudness.sci test/CMakeLists.txt test/Makefile.am test/abi/abi-descriptor-libFLAC++-1.4.3.xml test/abi/abi-descriptor-libFLAC-1.4.3.xml test/abi/abi-libFLAC++-1.4.0.dump.xz test/abi/abi-libFLAC-1.4.0.dump.xz test/common.sh.in test/cuesheet.ok test/cuesheets/Makefile.am test/cuesheets/bad.000.CATALOG_multiple.cue test/cuesheets/bad.001.CATALOG_missing_number.cue test/cuesheets/bad.002.CATALOG_number_too_long.cue test/cuesheets/bad.003.CATALOG_not_13_digits.cue test/cuesheets/bad.030.FLAGS_multiple.cue test/cuesheets/bad.031.FLAGS_wrong_place_1.cue test/cuesheets/bad.032.FLAGS_wrong_place_2.cue test/cuesheets/bad.060.INDEX_wrong_place.cue test/cuesheets/bad.061.INDEX_missing_number.cue test/cuesheets/bad.062.INDEX_invalid_number_1.cue test/cuesheets/bad.063.first_INDEX_not_0_or_1.cue test/cuesheets/bad.064.INDEX_num_non_sequential.cue test/cuesheets/bad.065.INDEX_num_out_of_range.cue test/cuesheets/bad.066.INDEX_missing_offset.cue test/cuesheets/bad.067.INDEX_illegal_offset.cue test/cuesheets/bad.068.INDEX_cdda_illegal_offset.cue test/cuesheets/bad.069.nonzero_first_INDEX.cue test/cuesheets/bad.070.INDEX_offset_not_ascending_1.cue test/cuesheets/bad.071.INDEX_offset_not_ascending_2.cue test/cuesheets/bad.110.ISRC_multiple.cue test/cuesheets/bad.111.ISRC_wrong_place_1.cue test/cuesheets/bad.112.ISRC_wrong_place_2.cue test/cuesheets/bad.113.ISRC_missing_number.cue test/cuesheets/bad.114.ISRC_invalid_number.cue test/cuesheets/bad.130.TRACK_missing_INDEX_01_1.cue test/cuesheets/bad.131.TRACK_missing_INDEX_01_2.cue test/cuesheets/bad.132.TRACK_missing_INDEX_01_3.cue test/cuesheets/bad.133.TRACK_missing_INDEX_01_4.cue test/cuesheets/bad.134.TRACK_missing_number.cue test/cuesheets/bad.135.TRACK_invalid_number_1.cue test/cuesheets/bad.136.TRACK_invalid_number_2.cue test/cuesheets/bad.137.TRACK_cdda_out_of_range.cue test/cuesheets/bad.138.TRACK_num_non_sequential.cue test/cuesheets/bad.139.TRACK_missing_type.cue test/cuesheets/bad.140.no_TRACKs.cue test/cuesheets/bad.200.FLAC_leadin_missing_offset.cue test/cuesheets/bad.201.FLAC_leadin_illegal_offset.cue test/cuesheets/bad.202.FLAC_leadin_cdda_illegal_offset.cue test/cuesheets/bad.230.FLAC_leadout_multiple.cue test/cuesheets/bad.231.FLAC_leadout_missing_track.cue test/cuesheets/bad.232.FLAC_leadout_illegal_track.cue test/cuesheets/bad.233.FLAC_leadout_missing_offset.cue test/cuesheets/bad.234.FLAC_leadout_illegal_offset.cue test/cuesheets/bad.235.FLAC_leadout_offset_not_211680000.cue test/cuesheets/good.000.cue test/cuesheets/good.001.cue test/cuesheets/good.002.dos_format.cue test/cuesheets/good.003.missing_final_newline.cue test/cuesheets/good.004.dos_format.missing_final_newline.cue test/cuesheets/good.005.quoted.isrc.cue test/flac-to-flac-metadata-test-files/Makefile.am test/flac-to-flac-metadata-test-files/Prøve.flac test/flac-to-flac-metadata-test-files/case00a-expect.meta test/flac-to-flac-metadata-test-files/case01a-expect.meta test/flac-to-flac-metadata-test-files/case01b-expect.meta test/flac-to-flac-metadata-test-files/case01c-expect.meta test/flac-to-flac-metadata-test-files/case01d-expect.meta test/flac-to-flac-metadata-test-files/case01e-expect.meta test/flac-to-flac-metadata-test-files/case02a-expect.meta test/flac-to-flac-metadata-test-files/case02b-expect.meta test/flac-to-flac-metadata-test-files/case02c-expect.meta test/flac-to-flac-metadata-test-files/case03a-expect.meta test/flac-to-flac-metadata-test-files/case03b-expect.meta test/flac-to-flac-metadata-test-files/case03c-expect.meta test/flac-to-flac-metadata-test-files/case04a-expect.meta test/flac-to-flac-metadata-test-files/case04b-expect.meta test/flac-to-flac-metadata-test-files/case04c-expect.meta test/flac-to-flac-metadata-test-files/case04d-expect.meta test/flac-to-flac-metadata-test-files/case04e-expect.meta test/flac-to-flac-metadata-test-files/input-SCPAP.flac test/flac-to-flac-metadata-test-files/input-SCVA.flac test/flac-to-flac-metadata-test-files/input-SCVAUP.flac test/flac-to-flac-metadata-test-files/input-SCVPAP.flac test/flac-to-flac-metadata-test-files/input-SVAUP.flac test/flac-to-flac-metadata-test-files/input-VA.flac test/flac-to-flac-metadata-test-files/input0.cue test/flac-to-flac-metadata-test-files/שלום.flac test/flac-to-flac-metadata-test-files/��.flac test/foreign-metadata-test-files/24bit-WaveFmtPCM.wav test/foreign-metadata-test-files/AIFF-C-sowt-compression-type-name.aifc test/foreign-metadata-test-files/AIFF-C-sowt-tag.aifc test/foreign-metadata-test-files/AIFF-ID3.aiff test/foreign-metadata-test-files/BWF-WaveFmtEx.wav test/foreign-metadata-test-files/Makefile.am test/generate_streams.sh test/metaflac-test-files/Makefile.am test/metaflac-test-files/case00-expect.meta test/metaflac-test-files/case01-expect.meta test/metaflac-test-files/case02-expect.meta test/metaflac-test-files/case03-expect.meta test/metaflac-test-files/case04-expect.meta test/metaflac-test-files/case05-expect.meta test/metaflac-test-files/case06-expect.meta test/metaflac-test-files/case07-expect.meta test/metaflac-test-files/case08-expect.meta test/metaflac-test-files/case09-expect.meta test/metaflac-test-files/case10-expect.meta test/metaflac-test-files/case11-expect.meta test/metaflac-test-files/case12-expect.meta test/metaflac-test-files/case13-expect.meta test/metaflac-test-files/case14-expect.meta test/metaflac-test-files/case15-expect.meta test/metaflac-test-files/case16-expect.meta test/metaflac-test-files/case17-expect.meta test/metaflac-test-files/case18-expect.meta test/metaflac-test-files/case19-expect.meta test/metaflac-test-files/case20-expect.meta test/metaflac-test-files/case21-expect.meta test/metaflac-test-files/case22-expect.meta test/metaflac-test-files/case23-expect.meta test/metaflac-test-files/case24-expect.meta test/metaflac-test-files/case25-expect.meta test/metaflac-test-files/case26-expect.meta test/metaflac-test-files/case27-expect.meta test/metaflac-test-files/case28-expect.meta test/metaflac-test-files/case29-expect.meta test/metaflac-test-files/case30-expect.meta test/metaflac-test-files/case31-expect.meta test/metaflac-test-files/case32-expect.meta test/metaflac-test-files/case33-expect.meta test/metaflac-test-files/case34-expect.meta test/metaflac-test-files/case35-expect.meta test/metaflac-test-files/case36-expect.meta test/metaflac-test-files/case37-expect.meta test/metaflac-test-files/case38-expect.meta test/metaflac-test-files/case39-expect.meta test/metaflac-test-files/case40-expect.meta test/metaflac-test-files/case41-expect.meta test/metaflac-test-files/case42-expect.meta test/metaflac-test-files/case43-expect.meta test/metaflac-test-files/case44-expect.meta test/metaflac-test-files/case45-expect.meta test/metaflac-test-files/case46-expect.meta test/metaflac-test-files/case47-expect.meta test/metaflac-test-files/case48-expect.meta test/metaflac-test-files/case49-expect.meta test/metaflac-test-files/case50-expect.meta test/metaflac-test-files/case51-expect.meta test/metaflac-test-files/case52-expect.meta test/metaflac-test-files/case53-expect.meta test/metaflac-test-files/case54-expect.meta test/metaflac-test-files/case55-expect.meta test/metaflac-test-files/case56-expect.meta test/metaflac-test-files/case57-expect.meta test/metaflac-test-files/case58-expect.meta test/metaflac-test-files/case59-expect.meta test/metaflac-test-files/case60-expect.meta test/metaflac-test-files/case61-expect.meta test/metaflac-test-files/case62-expect.meta test/metaflac-test-files/case63-expect.meta test/metaflac-test-files/case64-expect.meta test/metaflac-test-files/case65-expect.meta test/metaflac-test-files/case66-expect.meta test/metaflac-test-files/case67-expect.meta test/metaflac.flac.in test/metaflac.flac.ok test/picture.ok test/pictures/0.gif test/pictures/0.jpg test/pictures/0.png test/pictures/1.gif test/pictures/1.png test/pictures/2.gif test/pictures/2.png test/pictures/3.png test/pictures/4.jpg test/pictures/4.png test/pictures/5.png test/pictures/6.png test/pictures/7.png test/pictures/8.png test/pictures/Makefile.am test/test_compression.sh test/test_flac.sh test/test_grabbag.sh test/test_libFLAC++.sh test/test_libFLAC.sh test/test_metaflac.sh test/test_replaygain.sh test/test_seeking.sh test/test_streams.sh test/write_iff.pl

Revision

Date

Author

Comments

(<<< Hide modified files)

(Show modified files >>>)

600f14f4

29-Apr-2024

Xin Li <[email protected]>

[automerger skipped] Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future am: 3904d9c7a5 -s ours

am skip reason: Merged-In Ic6934c70e22cf1a2255d745a91193d531ea34a22 with SHA-1 a13cf

[automerger skipped] Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future am: 3904d9c7a5 -s ours

am skip reason: Merged-In Ic6934c70e22cf1a2255d745a91193d531ea34a22 with SHA-1 a13cf69c96 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/flac/+/27145258

Change-Id: Ica7ac16e1b73d330cc6e7f7deee133ca8e036955
Signed-off-by: Automerger Merge Worker <[email protected]>