diff options
| author |   Roger Zanoni <rzanoni@igalia.com> | 2021-04-07 17:01:14 +0200 |
|---|---|---|
| committer |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2021-05-25 15:52:33 +0200 |
| commit | 68a825c831be9a01c4c252eb02cacddb84e8d3c6 (patch) | |
| tree | ccda81cc0d085a621fc0eb8016cc41286a3fd9bb /recipes-wam/chromium/chromium.inc | |
| parent | 199ca8fa191c558159052aba1f56f9cd7fce31a2 (diff) | |
Restore chromium target and browser service
- Merged chromium changes to fix build after bumping to chromium 84
- Fixed chromium install on current recipe
- Restored the chromium browser service
Bug-AGL: SPEC-3830
Signed-off-by: Roger Zanoni <rzanoni@igalia.com>
Change-Id: I5cde7972021a4200581c2e161f848bcf7d8d0458
Diffstat (limited to 'recipes-wam/chromium/chromium.inc')
| -rw-r--r-- | recipes-wam/chromium/chromium.inc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/recipes-wam/chromium/chromium.inc b/recipes-wam/chromium/chromium.inc index 31542d1ef..69c9b438f 100644 --- a/recipes-wam/chromium/chromium.inc +++ b/recipes-wam/chromium/chromium.inc @@ -39,7 +39,7 @@ BROWSER_APP_BUILD_TARGET = "chrome" BROWSER_APPLICATION = "chromium84-browser" BROWSER_APPLICATION_DIR = "/opt/chromium84" -TARGET = "${WEBRUNTIME_BUILD_TARGET}" +TARGET = "${WEBRUNTIME_BUILD_TARGET} ${BROWSER_APP_BUILD_TARGET}" # Skip do_install_append of webos_system_bus. It is not compatible with this component. WEBOS_SYSTEM_BUS_FILES_LOCATION = "${S}/files/sysbus" @@ -76,7 +76,8 @@ GN_ARGS = "\ treat_warnings_as_errors=false\ is_agl=true\ use_cbe=true\ - is_chrome_cbe=false\ + is_chrome_cbe=true\ + is_component_build=false\ use_cups=false\ use_custom_libcxx=false\ use_kerberos=false\ @@ -239,16 +240,15 @@ configure_browser_settings() { } install_chromium_browser() { + # Install browser files + ${S}/depot_tools/ninja ${PARALLEL_MAKE} -C ${OUT_DIR}/${BUILD_TYPE} webos/install/default_browser + D_DIR=${D}${BROWSER_APPLICATION_DIR} + L_DIR=${D}${CBE_DATA_PATH} install -d ${D_DIR} + install -d ${L_DIR} - # Install browser files - if [ -e "${SRC_DIR}/webos/install" ]; then - cd ${OUT_DIR}/${BUILD_TYPE} - xargs --arg-file=${SRC_DIR}/webos/install/default_browser/binary.list cp -R --no-dereference --preserve=mode,links -v --target-directory=${D_DIR} - cd ${SRC_DIR} - xargs --arg-file=${SRC_DIR}/webos/install/default_browser/runtime.list cp -R --no-dereference --preserve=mode,links -v --target-directory=${D_DIR} - fi + cp -R --no-dereference --preserve=mode,links -v ${OUT_IMAGE_DIR}/${BROWSER_APPLICATION_DIR}/* ${D_DIR} # AGL does not have PMLOG sed -i.bak s/PmLogCtl.*// ${D_DIR}/run_webbrowser @@ -310,6 +310,7 @@ install_webruntime() { do_install() { install_webruntime + install_chromium_browser } WEBOS_SYSTEM_BUS_DIRS_LEGACY_BROWSER_APPLICATION = " \ |