aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-07Merge "Snap for 11541002 from fb709993be9d12149b8cf782f084bb44349926bd to ↵platform-tools-35.0.1sdk-releaseAndroid Build Coastguard Worker
sdk-release" into sdk-release
2024-03-07Snap for 11541002 from fb709993be9d12149b8cf782f084bb44349926bd to sdk-releaseAndroid Build Coastguard Worker
Change-Id: Ia0b5571371be55c46686ba8a0a3ef3353e1bb90a
2024-02-26Merge "Snap for 11497362 from 3e941abfdcb77b18c47932abc0da2903ef064c9a to ↵Android Build Coastguard Worker
sdk-release" into sdk-release
2024-02-26Snap for 11497362 from 3e941abfdcb77b18c47932abc0da2903ef064c9a to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I31eceb315e16a143f1329d64537a9f31fe848ae7
2024-02-23Merge "Revert "Mark libft2 as non-LLNDK"" into main am: 3e941abfdcHEADmastermainChris Lu
Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2975252 Change-Id: I2469d70b62725f7189f73c7476f0bde40f63fce7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-23Merge "Revert "Mark libft2 as non-LLNDK"" into mainChris Lu
2024-02-23Revert "Mark libft2 as non-LLNDK"Chris Lu
This reverts commit 230b2b75af27f4fa43f73bca356d8f58c315d49b. Reason for revert: test for b/326534602 Bug: 326534602 Change-Id: Iafa9488bc6b272fd5c67709d27edcdcd3f1990ba
2024-02-23Merge "Mark libft2 as non-LLNDK" into main am: 78c36d0ea7Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2873454 Change-Id: I0ff4cf5b3b65766bec43eb3a0b1ce7a7ef6b0087 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-23Merge "Mark libft2 as non-LLNDK" into mainTreehugger Robot
2024-02-20Mark libft2 as non-LLNDKKiyoung Kim
Libft2 was marked as private LLNDK because it is used by VNDK-SP. As of VNDK deprecation, libft2 no longer needs to be LLNDK. Remove LLNDK property from libft2 so it can be copied into vendor if required. Bug: 313354195 Test: AOSP CF build succeeded Change-Id: I673aea17893e3e06ac1fb8b7d22a803cf69b70b7 Merged-In: I673aea17893e3e06ac1fb8b7d22a803cf69b70b7
2023-12-13Merge "Snap for 11211409 from 6487a5bb15b26f09baa84eeed2fdf3bc77be5bf8 to ↵Android Build Coastguard Worker
sdk-release" into sdk-release
2023-12-13Snap for 11211409 from 6487a5bb15b26f09baa84eeed2fdf3bc77be5bf8 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: Ibbc62120250aafdcfbf7e2f0842f0bcfe916be32
2023-10-19Merge "Update FreeType to 2.13.2" into main am: 2aeec9fb95 am: 99ef141a3f ↵Treehugger Robot
am: b4e34e61ee Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2792273 Change-Id: I760e031369012a3616d561a3c27ec8c78e89ddbc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19Merge "Update FreeType to 2.13.2" into main am: 2aeec9fb95 am: 99ef141a3fTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2792273 Change-Id: I3c824d49571b09091d1913d60d2f27d5dffe53ad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19Merge "Snap for 10972066 from 2aeec9fb952d587e584d6b599c215e3f4813c6ac to ↵Android Build Coastguard Worker
sdk-release" into sdk-release
2023-10-19Snap for 10972066 from 2aeec9fb952d587e584d6b599c215e3f4813c6ac to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I110c6a4545a35853f7b671ff8f739096692dd2ba
2023-10-18Merge "Update FreeType to 2.13.2" into main am: 2aeec9fb95 am: 6487a5bb15 ↵Treehugger Robot
am: 8e77a75afb Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2792273 Change-Id: Ic1776aff7be0afc5c84f9f61754023c5557998ab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18Merge "Update FreeType to 2.13.2" into main am: 2aeec9fb95 am: 6487a5bb15Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2792273 Change-Id: I6e0198bf347cd2898db63dd4ae5e876b178e1391 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18Merge "Update FreeType to 2.13.2" into main am: 2aeec9fb95Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2792273 Change-Id: I1b051c2766c5e8e8b3d3eeaf8037b16725090068 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18Merge "Update FreeType to 2.13.2" into main am: 2aeec9fb95Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2792273 Change-Id: I8b861440340e2e835836f33eb493a2ce75d40551 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18Merge "Update FreeType to 2.13.2" into mainTreehugger Robot
2023-10-17Update FreeType to 2.13.2Seigo Nonaka
Merge commit '920c5502cc3ddda88f6c7d85ee834ac611bb11cc' into 2.13.2 Bug: 279803748 Test: TreeHugger Change-Id: Ib764bb5a725a6b6f33fc0914eab0a10445897497
2023-10-10Merge "Snap for 10929834 from 8697ac66489dca8c0726f1635b9091dc44cfefc2 to ↵Android Build Coastguard Worker
sdk-release" into sdk-release
2023-10-10Snap for 10929834 from 8697ac66489dca8c0726f1635b9091dc44cfefc2 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I35a617894451407c106bd27cc0f8b92f2a8cb085
2023-10-07[automerger skipped] Merge "Merge Android 14" into main am: 8697ac6648 -s ↵Xin Li
ours am: 4c9f1bc92e -s ours am: 695c0c6e9d -s ours am: 4e7cbecbd6 -s ours am: e4a6cc6f5b -s ours am skip reason: Merged-In Ie65ff6cbe7b779071d0c072501bcc271b7dc211d with SHA-1 5a90cf9c25 is already in history Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2776318 Change-Id: Ib0398edf428c1dfdaaaa7af10c0327334991d7c1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07[automerger skipped] Merge Android 14 am: 2389c22162 -s ours am: e5b985c5ca ↵Xin Li
-s ours am: 1f768cfe10 -s ours am: ecc1a19bf7 -s ours am: d5ad1ef20b -s ours am skip reason: Merged-In Ie65ff6cbe7b779071d0c072501bcc271b7dc211d with SHA-1 5a90cf9c25 is already in history Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2776318 Change-Id: Id52bd7091c1dd9933d69477baf66824e39585b6f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 8697ac6648 -s ↵Xin Li
ours am: 4c9f1bc92e -s ours am: 695c0c6e9d -s ours am: 4e7cbecbd6 -s ours am skip reason: Merged-In Ie65ff6cbe7b779071d0c072501bcc271b7dc211d with SHA-1 5a90cf9c25 is already in history Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2776318 Change-Id: Ib84c3dbc2fd592b578c3aa5da81dd3e46425b86a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 2389c22162 -s ours am: e5b985c5ca ↵Xin Li
-s ours am: 1f768cfe10 -s ours am: ecc1a19bf7 -s ours am skip reason: Merged-In Ie65ff6cbe7b779071d0c072501bcc271b7dc211d with SHA-1 5a90cf9c25 is already in history Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2776318 Change-Id: I8c209c1b2f4e1b228bc095e318b2b15a1d18133a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 8697ac6648 -s ↵Xin Li
ours am: 4c9f1bc92e -s ours am: 695c0c6e9d -s ours am skip reason: Merged-In Ie65ff6cbe7b779071d0c072501bcc271b7dc211d with SHA-1 5a90cf9c25 is already in history Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2776318 Change-Id: I1ec8e838f4499cc8820d100b2a274b189f15f5d4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 2389c22162 -s ours am: e5b985c5ca ↵Xin Li
-s ours am: 1f768cfe10 -s ours am skip reason: Merged-In Ie65ff6cbe7b779071d0c072501bcc271b7dc211d with SHA-1 5a90cf9c25 is already in history Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2776318 Change-Id: I75c093e879de65a53f3ba21fcb137ebd8fb51b04 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 8697ac6648 -s ↵Xin Li
ours am: 4c9f1bc92e -s ours am skip reason: Merged-In Ie65ff6cbe7b779071d0c072501bcc271b7dc211d with SHA-1 5a90cf9c25 is already in history Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2776318 Change-Id: Ic51dd5fe175cbf83364a6fc298c474b8f7e0fd4b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 2389c22162 -s ours am: e5b985c5ca ↵Xin Li
-s ours am skip reason: Merged-In Ie65ff6cbe7b779071d0c072501bcc271b7dc211d with SHA-1 5a90cf9c25 is already in history Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2776318 Change-Id: Icf9fb61cf7d75a4c68194aefafe75055b7af3bcc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 8697ac6648 -s oursXin Li
am skip reason: Merged-In Ie65ff6cbe7b779071d0c072501bcc271b7dc211d with SHA-1 5a90cf9c25 is already in history Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2776318 Change-Id: Iee207171e0bbe756fbcd25e5f5dc0bee01b88b5d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 2389c22162 -s oursXin Li
am skip reason: Merged-In Ie65ff6cbe7b779071d0c072501bcc271b7dc211d with SHA-1 5a90cf9c25 is already in history Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2776318 Change-Id: I2381cac8b3b93bf9c91e0bd8b65ac84fb74b96f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06Merge "Merge Android 14" into mainXin Li
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: Ie65ff6cbe7b779071d0c072501bcc271b7dc211d Change-Id: Ifb7abd486e9edd93be3841247d50b3c81b4ae2da
2023-10-04Merge "Snap for 10900817 from bc8a33689d4347a63ef35ad55629b0e43e51767d to ↵platform-tools-34.0.5Android Build Coastguard Worker
sdk-release" into sdk-release
2023-10-04Snap for 10900817 from bc8a33689d4347a63ef35ad55629b0e43e51767d to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I8a8604a5cbdb78f1e78a7d56decb44cbade7e60d
2023-08-25* Version 2.13.2 released.Werner Lemberg
========================== Tag sources with `VER-2-13-2'. * docs/VERSION.TXT: Add entry for version 2.13.2. * docs/CHANGES: Updated. * docs/release, docs/README, builds/macs/README: Updated. * README, src/base/ftver.rc, builds/windows/vc2010/index.html, builds/windows/visualc/index.html, builds/windows/visualce/index.html, builds/wince/vc2005-ce/index.html, builds/wince/vc2008-ce/index.html, docs/freetype-config.1: s/2.13.1/2.13.2/, s/2131/2132/. * include/freetype/freetype.h (FREETYPE_PATCH): Set to 2. * builds/unix/configure.raw (version_info): Set to 26:1:20. * CMakeLists.txt (VERSION_PATCH): Set to 2.
2023-08-25* src/base/ftcalc.c (FT_MulAddFix): Simplify 32-bit rounding.Alexei Podtelezhnikov
2023-08-25Fix clang warnings.Werner Lemberg
* src/cffload.c (cff_blend_doBlend): Fix type of `sum`. * src/truetype/ttgxvar.c (tt_var_load_item_variation_store): Fix type of `word_delta_count`.
2023-08-24* subprojects/*.wrap: Updated.Werner Lemberg
2023-08-24builds/unix/configure.raw: Use variable to specify minimum Python version.Hugh McMaster
2023-08-24* builds/toplevel.mk: Simplify version extraction.Alexei Podtelezhnikov
2023-08-22[base] Improve the matrix degeneracy check.Alexei Podtelezhnikov
Also fixes #1251. * src/base/ftcalc.c (FT_Matrix_Check): To avoid overflow, scale by shifting. * include/freetype/internal/ftcalc.h (FT_Matrix_Check): Update description.
2023-08-22builds/toplevel.mk: Don't use `\#` in functions.Werner Lemberg
The behaviour changed in GNU make 4.3, where `#` (without the backslash) would be necessary. Using a variable instead the code works with both older and newer GNU make versions. Fixes #1252.
2023-08-19builds/freetype.mk: Invoke `mkdocs` as a Python moduleHugh McMaster
FreeType's `refdoc` target currently allows users to override the default Python path, which is useful for testing and development. In contrast, `mkdocs` is invoked via the default Python path. Invoking `mkdocs` via Python's module syntax allows for greater flexibility, although there is no change for the default use case.
2023-08-17[base] Avoid UB with memcpyBen Wagner
`FT_NEW_ARRAY(p, 0)` sets `p` to `NULL`. `FT_Stream_ReadAt` with a memory based stream uses `FT_MEM_COPY` which is `memcpy` which specifies that it is undefined behavior for either the `src` or `dst` to be `NULL`. Instead of forcing all callers work around calling `FT_Stream_Read` when `buffer == NULL && count == 0` do the check in `FT_StreamRead`. This allows any call with `count == 0` to succesfully read zero bytes without UB. * src/base/ftstream.c (FT_Stream_ReadAt): skip `FT_MEM_COPY` when `count == 0`. (FT_Stream_TryRead): ditto Fixes: #1250
2023-08-15Merge "Update the owners to the current maintainer" into main am: bc8a33689d ↵Treehugger Robot
am: 9fca458296 am: eb6b2c73bf am: 0a27b23453 am: f84dbdb196 Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2707213 Change-Id: I64248f245b47c37ff5795236cb5c908d6fc681d5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15Merge "Update the owners to the current maintainer" into main am: bc8a33689d ↵Treehugger Robot
am: 9fca458296 am: eb6b2c73bf am: 0a27b23453 Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2707213 Change-Id: I73c6e291098c67eba65469bc714ea61537a179a6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>