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>
diff --git a/METADATA b/METADATA
index 4859849..7070cdd 100644
--- a/METADATA
+++ b/METADATA
@@ -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 78c7e55..16f9786 100755
--- a/update_libvpx.sh
+++ b/update_libvpx.sh
@@ -65,8 +65,7 @@
&& 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\ )"
