diff options
| author | Xin Li <delphij@google.com> | 2018-08-06 16:50:47 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2018-08-06 16:50:47 -0700 |
| commit | 14248858345d6613296f458f3b4dfd8799aae695 (patch) | |
| tree | e86321a1146f19e3f3af2512eed37865c33758f3 | |
| parent | 4756f2b049f23e52664067b7a24666d13dec3895 (diff) | |
| parent | b8bb2f66e121d342d36d7f76da801e02033a7ed8 (diff) | |
| download | webp-14248858345d6613296f458f3b4dfd8799aae695.tar.gz | |
Merge Android Pie into master
Bug: 112104996
Change-Id: Ie996eb9b947c135174d71a526e7bac01c373c2f0
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | README.android | 1 |
2 files changed, 3 insertions, 0 deletions
@@ -108,6 +108,8 @@ cc_library_static { local_include_dirs: ["."], static_libs: ["webp-headers"], export_static_lib_headers: ["webp-headers"], + + sdk_version: "9", } //############################################## diff --git a/README.android b/README.android index 461da150..fda9c32f 100644 --- a/README.android +++ b/README.android @@ -10,6 +10,7 @@ Local modifications: These files are not required to build via Android.bp - Undefine WEBP_ANDROID_NEON on Android targets and use __ARM_NEON__ instead. +- cherry-pick 7038ca8d demux,StoreFrame: restore hdr size check to min req The Android.bp file creates WebP decoder and encoder static libraries which can be added to any application by adding libwebp-decode and libwebp-encode to |