S = "${WORKDIR}/git"
SRC_DIR = "${S}/src"
-OUT_DIR = "${WORKDIR}/build"
BUILD_TYPE = "Release"
-B = "${OUT_DIR}/${BUILD_TYPE}"
-
-OUT_IMAGE_DIR = "${B}/image"
+B = "${WORKDIR}/build"
+OUT_DIR = "${B}/${BUILD_TYPE}"
WEBRUNTIME_BUILD_TARGET = "webos:weboswebruntime"
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.
+# Skip do_install:append of webos_system_bus. It is not compatible with this component.
WEBOS_SYSTEM_BUS_FILES_LOCATION = "${S}/files/sysbus"
PACKAGECONFIG ?= "jumbo use-upstream-wayland"
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\
# instead, so that if DEBUG_BUILD is not set GN will not create a huge debug
# binary anyway. Since our compiler flags are passed after GN's, -g0 does
# not cause any issues if DEBUG_BUILD is set, as -g1 will be passed later.
-DEBUG_FLAGS_remove_arm = "-g"
-DEBUG_FLAGS_append_arm = "-g1"
-DEBUG_FLAGS_remove_x86 = "-g"
-DEBUG_FLAGS_append_x86 = "-g1"
+DEBUG_FLAGS:remove:arm = "-g"
+DEBUG_FLAGS:append:arm = "-g1"
+DEBUG_FLAGS:remove:x86 = "-g"
+DEBUG_FLAGS:append:x86 = "-g1"
GN_ARGS += "symbol_level=0"
# We do not want to use Chromium's own Debian-based sysroots, it is easier to
ARM_FLOAT_ABI = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'hard', 'softfp', d)}"
ARM_FPU = "${@get_compiler_flag(d.getVar('TUNE_CCARGS').split(), '-mfpu', d)}"
ARM_TUNE = "${@get_compiler_flag(d.getVar('TUNE_CCARGS').split(), '-mcpu', d)}"
-ARM_VERSION_aarch64 = "8"
-ARM_VERSION_armv7a = "7"
-ARM_VERSION_armv7ve = "7"
-ARM_VERSION_armv6 = "6"
+ARM_VERSION:aarch64 = "8"
+ARM_VERSION:armv7a = "7"
+ARM_VERSION:armv7ve = "7"
+ARM_VERSION:armv6 = "6"
# GN computes and defaults to it automatically where needed
# forcing it from cmdline breaks build on places where it ends up
# overriding what GN wants
-TUNE_CCARGS_remove = "-mthumb"
+TUNE_CCARGS:remove = "-mthumb"
-GN_ARGS_append_arm = " \
+GN_ARGS:append:arm = " \
arm_float_abi=\"${ARM_FLOAT_ABI}\" \
arm_fpu=\"${ARM_FPU}\" \
arm_tune=\"${ARM_TUNE}\" \
"
# tcmalloc's atomicops-internals-arm-v6plus.h uses the "dmb" instruction that
# is not available on (some?) ARMv6 models, which causes the build to fail.
-GN_ARGS_append_armv6 += 'use_allocator="none"'
+GN_ARGS:append:armv6 += 'use_allocator="none"'
# The WebRTC code fails to build on ARMv6 when NEON is enabled.
# https://bugs.chromium.org/p/webrtc/issues/detail?id=6574
-GN_ARGS_append_armv6 += 'arm_use_neon=false'
+GN_ARGS:append:armv6 += 'arm_use_neon=false'
# Disable glibc shims on musl
# tcmalloc does not play well with musl as of M62 (and possibly earlier).
# https://github.com/gperftools/gperftools/issues/693
-GN_ARGS_append_libc-musl = ' use_allocator_shim=false'
+GN_ARGS:append:libc-musl = ' use_allocator_shim=false'
# More options to speed up the build
GN_ARGS += "\
# Doesn't build for armv[45]*
COMPATIBLE_MACHINE = "(-)"
-COMPATIBLE_MACHINE_aarch64 = "(.*)"
-COMPATIBLE_MACHINE_armv6 = "(.*)"
-COMPATIBLE_MACHINE_armv7a = "(.*)"
-COMPATIBLE_MACHINE_armv7ve = "(.*)"
-COMPATIBLE_MACHINE_x86 = "(.*)"
-COMPATIBLE_MACHINE_x86-64 = "(.*)"
+COMPATIBLE_MACHINE:aarch64 = "(.*)"
+COMPATIBLE_MACHINE:armv6 = "(.*)"
+COMPATIBLE_MACHINE:armv7a = "(.*)"
+COMPATIBLE_MACHINE:armv7ve = "(.*)"
+COMPATIBLE_MACHINE:x86 = "(.*)"
+COMPATIBLE_MACHINE:x86-64 = "(.*)"
#CHROMIUM_PLUGINS_PATH = "${libdir}"
CBE_DATA_PATH = "${libdir}/cbe"
# The text relocations are intentional -- see comments in [GF-52468]
# TODO: check if we need INSANE_SKIP on ldflags
-INSANE_SKIP_${PN} = "textrel ldflags"
+INSANE_SKIP:${PN} = "textrel ldflags"
do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+"
do_compile() {
- if [ ! -f ${OUT_DIR}/${BUILD_TYPE}/build.ninja ]; then
+ if [ ! -f ${OUT_DIR}/build.ninja ]; then
do_configure
fi
export PATH="${S}/depot_tools:$PATH"
- ${S}/depot_tools/ninja ${PARALLEL_MAKE} -v -C ${OUT_DIR}/${BUILD_TYPE} ${TARGET}
+ ${S}/depot_tools/ninja ${PARALLEL_MAKE} -v -C ${OUT_DIR} ${TARGET}
}
do_configure() {
echo GN_ARGS is ${GN_ARGS}
echo BUILD_TARGETS are ${TARGET}
cd ${SRC_DIR}
- gn gen ${OUT_DIR}/${BUILD_TYPE} --args="${GN_ARGS}"
+ gn gen ${OUT_DIR} --args="${GN_ARGS}"
}
WINDOW_SIZE ?= "1920,1080"
}
install_chromium_browser() {
+ # Install browser files
+ ${S}/depot_tools/ninja ${PARALLEL_MAKE} -C ${OUT_DIR} 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_DIR}/image/${BROWSER_APPLICATION_DIR}/* ${D_DIR}
# AGL does not have PMLOG
sed -i.bak s/PmLogCtl.*// ${D_DIR}/run_webbrowser
install_webruntime() {
# # Generate install webos webview files
- # ${S}/depot_tools/ninja ${PARALLEL_MAKE} -C ${OUT_DIR}/${BUILD_TYPE} webos/install/weboswebruntime
+ # ${S}/depot_tools/ninja ${PARALLEL_MAKE} -C ${OUT_DIR} webos/install/weboswebruntime
# # Move installation files to D directory
- # mv ${OUT_DIR}/${BUILD_TYPE}/image/* ${D}
+ # mv ${OUT_DIR}/image/* ${D}
# # Rename include and locale directories
# mv ${D}${includedir}/webruntime ${D}${includedir}/${BPN}
# mv ${D}${CBE_DATA_PATH}/neva_locales ${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}${bindir_cross}
- # gzip -c ${OUT_DIR}/${BUILD_TYPE}/${MKSNAPSHOT_PATH}mksnapshot > ${D}${bindir_cross}/${HOST_SYS}-mksnapshot.gz
+ # gzip -c ${OUT_DIR}/${MKSNAPSHOT_PATH}mksnapshot > ${D}${bindir_cross}/${HOST_SYS}-mksnapshot.gz
install -d ${D}${libdir}
install -d ${D}${libdir}/swiftshader
install -d ${D}${CBE_DATA_LOCALES_PATH}
# Install webos webview files
- ${S}/depot_tools/ninja ${PARALLEL_MAKE} -C ${OUT_DIR}/${BUILD_TYPE} webos/install/weboswebruntime
+ ${S}/depot_tools/ninja ${PARALLEL_MAKE} -C ${OUT_DIR} webos/install/weboswebruntime
- install -v -m 0644 ${OUT_DIR}/${BUILD_TYPE}/swiftshader/*.so ${D}${libdir}/swiftshader
+ install -v -m 0644 ${OUT_DIR}/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}
+ cp -R --no-dereference --preserve=mode,links -v ${OUT_DIR}/image/${includedir}/${BPN}/* ${D}${includedir}/${BPN}/
+ install -v -m 0644 ${OUT_DIR}/image/${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}
+ install -v -m 0644 ${OUT_DIR}/image/${CBE_DATA_PATH}/icudtl.dat ${D}${CBE_DATA_PATH}
+ install -v -m 0644 ${OUT_DIR}/image/${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}
+ install -v -m 0644 ${OUT_DIR}/image/${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}
+ cp -R --no-dereference --preserve=mode,links -v ${OUT_DIR}/image/${CBE_DATA_LOCALES_PATH}/*.pak ${D}${CBE_DATA_LOCALES_PATH}
chown root:root -R ${D}${libdir}
chown root:root -R ${D}${includedir}
# 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}
- gzip -c ${OUT_DIR}/${BUILD_TYPE}/${MKSNAPSHOT_PATH}mksnapshot > ${D}${base_bindir}/${HOST_SYS}-mksnapshot.gz
+ gzip -c ${OUT_DIR}/${MKSNAPSHOT_PATH}mksnapshot > ${D}${base_bindir}/${HOST_SYS}-mksnapshot.gz
}
do_install() {
install_webruntime
+ install_chromium_browser
}
WEBOS_SYSTEM_BUS_DIRS_LEGACY_BROWSER_APPLICATION = " \
${webos_sysbus_pubrolesdir}/${BROWSER_APPLICATION}.json \
"
-SYSROOT_DIRS_append = " ${bindir_cross}"
+SYSROOT_DIRS:append = " ${bindir_cross}"
-PACKAGES_prepend = " \
+PACKAGES:prepend = " \
${PN}-cross-mksnapshot \
${BROWSER_APPLICATION} \
"
-FILES_${BROWSER_APPLICATION} += " \
+FILES:${BROWSER_APPLICATION} += " \
${BROWSER_APPLICATION_DIR} \
${WEBOS_SYSTEM_BUS_DIRS_LEGACY_BROWSER_APPLICATION} \
"
-RDEPENDS_${BROWSER_APPLICATION} += "${PN}"
+RDEPENDS:${BROWSER_APPLICATION} += "${PN}"
VIRTUAL-RUNTIME_gpu-libs ?= ""
-RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_gpu-libs}"
+RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_gpu-libs}"
# The text relocations are intentional -- see comments in [GF-52468]
# TODO: check if we need INSANE_SKIP on ldflags
-INSANE_SKIP_${BROWSER_APPLICATION} += "libdir ldflags textrel"
+INSANE_SKIP:${BROWSER_APPLICATION} += "libdir ldflags textrel"
-FILES_${PN} = " \
+FILES:${PN} = " \
${libdir}/*.so \
${libdir}/swiftshader/*.so \
${CBE_DATA_PATH}/* \
${WEBOS_SYSTEM_BUS_DIRS} \
"
-FILES_${PN}-dev = " \
+FILES:${PN}-dev = " \
${includedir} \
"
-FILES_${PN}-cross-mksnapshot = "${bindir_cross}/${HOST_SYS}-mksnapshot.gz"
+FILES:${PN}-cross-mksnapshot = "${bindir_cross}/${HOST_SYS}-mksnapshot.gz"
Code Review / AGL / meta-agl-demo.git / blobdiff