diff options
| author | Xin Li <delphij@google.com> | 2018-08-07 16:51:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-07 16:51:25 +0000 |
| commit | 464a4d5dcde1782797f688b73fff3a518cdc3ede (patch) | |
| tree | e86321a1146f19e3f3af2512eed37865c33758f3 | |
| parent | 4756f2b049f23e52664067b7a24666d13dec3895 (diff) | |
| parent | 14248858345d6613296f458f3b4dfd8799aae695 (diff) | |
| download | webp-oreo-mr1-1.2-iot-release.tar.gz | |
Merge "Merge Android Pie into master"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-release
| -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 |