diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-11-16 07:19:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-11-16 07:19:50 +0000 |
| commit | 7637652f49f53740173ff971318e9c224091d726 (patch) | |
| tree | 4232d230e8342590f4817b45e11dd491ec14f553 | |
| parent | 13c20fcd0474b1fe11262c0b3af3c12b9e6c0b5c (diff) | |
| parent | f5461e9e83a2ef16c58e362493d557b8d2236737 (diff) | |
| download | libvpx-7637652f49f53740173ff971318e9c224091d726.tar.gz | |
Merge "Merge tag 'v1.12.0' into master" am: f5461e9e83
Original change: https://android-review.googlesource.com/c/platform/external/libvpx/+/2276790
Change-Id: I38924e3079a7c99feca9c4002699d624a8f602fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | METADATA | 13 | ||||
| -rwxr-xr-x | update_libvpx.sh | 3 |
2 files changed, 14 insertions, 2 deletions
@@ -1,6 +1,19 @@ +name: "libvpx" +description: "Android fork of the libvpx library." + third_party { + url { + type: GIT + value: "https://chromium.googlesource.com/webm/libvpx" + } + version: "v1.12.0" license_type: NOTICE security { tag: "NVD-CPE2.3:cpe:/a:webmproject:libvpx:-" } + last_upgrade_date { + year: 2022 + month: 11 + day: 15 + } } diff --git a/update_libvpx.sh b/update_libvpx.sh index 78c7e5540..16f978653 100755 --- a/update_libvpx.sh +++ b/update_libvpx.sh @@ -65,8 +65,7 @@ fi && die "Unable to get upstream commit corresponding to ${GIT_BRANCH}"; # Merge $GIT_BRANCH by allowing unrelated histories and squashing the changes -git merge -X theirs $UPSTREAM_COMMIT --allow-unrelated-histories \ - --squash --no-commit +git merge $UPSTREAM_COMMIT add="$(git diff-index --diff-filter=A $prev_hash | \ tr -s [:blank:] ' ' | cut -f6 -d\ )" |