chromium68: fix aarch64 link issuehalibut_7.99.2halibut/7.99.27.99.2

Backport upstream patch:
https://chromium-review.googlesource.com/c/chromium/third_party/ffmpeg/+/1390286

Fix this error when linking libcbe.so:
  obj/third_party/ffmpeg/ffmpeg_internal/
    autorename_libavcodec_aarch64_h264idct_neon.o:

  relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol
  `ff_h264_idct8_add_neon' which may bind externally can not be used
  when making a shared object; recompile with -fPIC

Also remove the mksnapshot path override for aarch64, it is not
necessary now we run mksnapshot with qemu. This fixes the install
step.

Bug-AGL: SPEC-2506

Change-Id: Idb90c8c20910ec48ed01f1b02528f14781edc4a3
Signed-off-by: Nick Yamane <nickdiego@igalia.com>
Signed-off-by: Jacobo Aragunde Pérez <jaragunde@igalia.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/meta-html5-framework/recipes-wam/chromium/chromium68_git.bb b/meta-html5-framework/recipes-wam/chromium/chromium68_git.bb
index 70255bf3..28179fd5 100644
--- a/meta-html5-framework/recipes-wam/chromium/chromium68_git.bb
+++ b/meta-html5-framework/recipes-wam/chromium/chromium68_git.bb
@@ -30,6 +30,9 @@ SRCREV_v8 = "1e3af71f1ff3735e8a5b639c48dfca63a7b8a647"
 SRC_URI_append_armv7a = " file://0001-skia-Build-skcms-with-mfp16-format-ieee-on-GCC-ARM-b.patch"
 SRC_URI_append_armv7ve = " file://0001-skia-Build-skcms-with-mfp16-format-ieee-on-GCC-ARM-b.patch"
 
+# Backport of https://chromium-review.googlesource.com/c/chromium/third_party/ffmpeg/+/1390286
+SRC_URI_append_aarch64 = " file://0001-libavcodec-Remove-dynamic-relocs-from-h264idct_neon..patch"
+
 # we don't include SRCPV in PV, so we have to manually include SRCREVs in do_fetch vardeps
 do_fetch[vardeps] += "SRCREV_v8"
 SRCREV_FORMAT = "main_v8"
@@ -336,7 +339,6 @@ install_chromium_browser() {
 
 MKSNAPSHOT_PATH = ""
 MKSNAPSHOT_PATH_arm = "clang_x86_v8_arm/"
-MKSNAPSHOT_PATH_aarch64 = "clang_x64_v8_arm64/"
 
 install_webruntime() {
     install -d ${D}${libdir}