From f72b346589659e2936c4fa959816e4347dcf849e Mon Sep 17 00:00:00 2001
From: Roger Zanoni <rzanoni@igalia.com>
Date: Wed, 24 Mar 2021 09:19:53 +0100
Subject: web-runtime: Fix chromium do_install on yp 3.1.6

Remove DESTDIR from the build directory

Bug-AGL: SPEC-3856

Signed-off-by: Roger Zanoni <rzanoni@igalia.com>
Change-Id: I7ea01750daab1522f2e7558a11e0594ec0772bba
---
 recipes-wam/chromium/chromium.inc      | 13 +++++++++++++
 recipes-wam/chromium/chromium84_git.bb |  3 ---
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'recipes-wam')

diff --git a/recipes-wam/chromium/chromium.inc b/recipes-wam/chromium/chromium.inc
index 3144993f0..31542d1ef 100644
--- a/recipes-wam/chromium/chromium.inc
+++ b/recipes-wam/chromium/chromium.inc
@@ -32,6 +32,8 @@ BUILD_TYPE = "Release"
 
 B = "${OUT_DIR}/${BUILD_TYPE}"
 
+OUT_IMAGE_DIR = "${B}/image"
+
 WEBRUNTIME_BUILD_TARGET = "webos:weboswebruntime"
 BROWSER_APP_BUILD_TARGET = "chrome"
 BROWSER_APPLICATION = "chromium84-browser"
@@ -286,8 +288,19 @@ install_webruntime() {
 
     install -v -m 0644 ${OUT_DIR}/${BUILD_TYPE}/swiftshader/*.so ${D}${libdir}/swiftshader
 
+    cp -R --no-dereference --preserve=mode,links -v ${OUT_IMAGE_DIR}/${includedir}/${BPN}/* ${D}${includedir}/${BPN}/
+    install -v -m 0644 ${OUT_IMAGE_DIR}/${libdir}/*.so ${D}${libdir}
+
+    install -v -m 0644 ${OUT_IMAGE_DIR}/${CBE_DATA_PATH}/icudtl.dat ${D}${CBE_DATA_PATH}
+    install -v -m 0644 ${OUT_IMAGE_DIR}/${CBE_DATA_PATH}/snapshot_blob.bin ${D}${CBE_DATA_PATH}
+    # app_runtime_content.pak, webos_content.pak, extensions_shell_and_test.pak
+    install -v -m 0644 ${OUT_IMAGE_DIR}/${CBE_DATA_PATH}/*.pak ${D}${CBE_DATA_PATH}
+
+    cp -R --no-dereference --preserve=mode,links -v ${OUT_IMAGE_DIR}/${CBE_DATA_LOCALES_PATH}/*.pak ${D}${CBE_DATA_LOCALES_PATH}
+
     chown root:root -R ${D}${libdir}
     chown root:root -R ${D}${includedir}
+    chown root:root -R ${D}${CBE_DATA_LOCALES_PATH}
 
     # move this to separate mksnapshot-cross recipe once we figure out how to build just cross mksnapshot from chromium repository
     install -d ${D}${base_bindir}
diff --git a/recipes-wam/chromium/chromium84_git.bb b/recipes-wam/chromium/chromium84_git.bb
index 90c7e6189..f5d073267 100644
--- a/recipes-wam/chromium/chromium84_git.bb
+++ b/recipes-wam/chromium/chromium84_git.bb
@@ -78,6 +78,3 @@ GN_ARGS += "\
 # check if it can be removed in the future.
 PACKAGECONFIG_remove_qemux86 = "gstreamer umediaserver neva-media gav neva-webrtc"
 #END TODO
-
-D = "${OUT_DIR}/${BUILD_TYPE}/image"
-
-- 
cgit 1.2.3-korg