chromeos-chrome: Update to 39.0.2160.2_rc-r1
TEST=build & boot on ryu
BUG=chrome-os-partner:31983
Change-Id: I8d2edc0fc4ed04330a52c069b231e79be0d9c083
Reviewed-on: https://chromium-review.googlesource.com/218760
Reviewed-by: Alex Sakhartchouk <alexst@chromium.org>
Tested-by: Michael Spang <spang@chromium.org>
diff --git a/chromeos-base/chromeos-chrome/Manifest b/chromeos-base/chromeos-chrome/Manifest
index 21c54e2..6086b72 100644
--- a/chromeos-base/chromeos-chrome/Manifest
+++ b/chromeos-base/chromeos-chrome/Manifest
@@ -1,2 +1 @@
-DIST chromeos-chrome-amd64-38.0.2092.2.afdo.bz2 2347715 SHA256 879a23b1b4876ad1194b46c1cf7f32b63bff5ca3291d7d870df00fc27ad077d3 SHA512 a3c73e667259cab4b6e69e40f0054e4d1dc2d0d4d5d8652f660f836e048cff10ea66109a0bb160b97dd153bfb2a4d4f0cd975681fe12351cff6aca5b2ee5645e WHIRLPOOL b81327138e084613c385f98974c0413aeba568885842410ac3f8292b48a50a526c7ceaf3b47b492e32b317313ee3bfa462adc0be15898162c6b117764a69fe41
-DIST chromeos-chrome-amd64-39.0.2138.3_rc-r1.afdo.bz2 2183163 SHA256 e5840ce069c3025d0ff82ac0ae0927b3df0d0944945b03b0e2db745a79f138da SHA512 5dac551e2d6cdd8ccc74fe377edbb83431ab0ff76fd4cd804144c70c03165023d07c01413fb0b78e7ac39081ae1f0be03b3000f8bde92a8b991fcb7608308ea2 WHIRLPOOL 7ec2be0e776d3c84bb7e69cd386702681513d0e4051cd4de2c7e1e9eef3bcbe648288e283352e7cf7ae9e739d398fa704f63692b4ed16c0ce7b24b6ead2d3abe
+DIST chromeos-chrome-amd64-39.0.2160.2_rc-r1.afdo.bz2 2375927 SHA256 3a84ea6aa739d048cd692861449aad823fd39aa8d1cb2fa7a52db6a42bf92a02 SHA512 72851200e8b49d15941fb3ccb97f4676f8fb5a96cf3c20815416c7cfc2d0e2256db007823e6e241f62f4f44c10f590838e45370de02f4269dac9e0af094f10d1 WHIRLPOOL 60a031aada223aee9192e8ff20d8aaafdb183c46d2f72141859fed693644f8a6d8c9bce0cf196a07cdd0a1c1f2819c0c95c346cedacedc811e616f699108b9e6
diff --git a/chromeos-base/chromeos-chrome/chromeos-chrome-38.0.2095.1_alpha-r2.ebuild b/chromeos-base/chromeos-chrome/chromeos-chrome-38.0.2095.1_alpha-r2.ebuild
deleted file mode 100644
index 7f38760..0000000
--- a/chromeos-base/chromeos-chrome/chromeos-chrome-38.0.2095.1_alpha-r2.ebuild
+++ /dev/null
@@ -1,1082 +0,0 @@
-# Copyright 2012 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-# Usage: by default, downloads chromium browser from the build server.
-# If CHROME_ORIGIN is set to one of {SERVER_SOURCE, LOCAL_SOURCE, LOCAL_BINARY},
-# the build comes from the chromimum source repository (gclient sync),
-# build server, locally provided source, or locally provided binary.
-# If you are using SERVER_SOURCE, a gclient template file that is in the files
-# directory which will be copied automatically during the build and used as
-# the .gclient for 'gclient sync'.
-# If building from LOCAL_SOURCE or LOCAL_BINARY specifying BUILDTYPE
-# will allow you to specify "Debug" or another build type; "Release" is
-# the default.
-# gclient is expected to be in ~/depot_tools if EGCLIENT is not set
-# to gclient path.
-
-EAPI="4"
-inherit autotest-deponly binutils-funcs cros-constants eutils flag-o-matic git-2 multilib toolchain-funcs
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://www.chromium.org/"
-SRC_URI=""
-
-LICENSE="BSD-Google
- chrome_internal? ( Google-TOS )"
-SLOT="0"
-KEYWORDS="~*"
-IUSE="
- afdo_use
- +accessibility
- app_shell
- asan
- +build_tests
- +chrome_debug
- chrome_debug_tests
- chrome_internal
- chrome_media
- +chrome_remoting
- clang
- component_build
- deep_memory_profiler
- drm
- ecs
- evdev_gestures
- +gold
- hardfp
- +highdpi
- internal_gles_conform
- mojo
- +nacl
- neon
- +ninja
- opengl
- opengles
- ozone
- +reorder
- +runhooks
- verbose
- vtable_verify
- X
- "
-
-OZONE_PLATFORM_PREFIX=ozone_platform_
-OZONE_PLATFORMS=(dri test egltest caca gbm eglmarzone)
-IUSE_OZONE_PLATFORMS="${OZONE_PLATFORMS[@]/#/${OZONE_PLATFORM_PREFIX}}"
-IUSE+=" ${IUSE_OZONE_PLATFORMS}"
-
-# Do not strip the nacl_helper_bootstrap binary because the binutils
-# objcopy/strip mangles the ELF program headers.
-# TODO(mcgrathr,vapier): This should be removed after portage's prepstrip
-# script is changed to use eu-strip instead of objcopy and strip.
-STRIP_MASK+=" */nacl_helper_bootstrap"
-
-
-REQUIRED_USE="
- ecs? ( ozone )
-"
-REORDER_SUBDIR="reorder"
-
-# Portage version without optional portage suffix.
-CHROME_VERSION="${PV/_*/}"
-
-CHROME_SRC="chrome-src"
-if use chrome_internal; then
- CHROME_SRC="${CHROME_SRC}-internal"
-fi
-
-# CHROME_CACHE_DIR is used for storing output artifacts, and is always a
-# regular directory inside the chroot (i.e. it's never mounted in, so it's
-# always safe to use cp -al for these artifacts).
-if [[ -z ${CHROME_CACHE_DIR} ]] ; then
- CHROME_CACHE_DIR="/var/cache/chromeos-chrome/${CHROME_SRC}"
-fi
-addwrite "${CHROME_CACHE_DIR}"
-
-# CHROME_DISTDIR is used for storing the source code, if any source code
-# needs to be unpacked at build time (e.g. in the SERVER_SOURCE scenario.)
-# It will be mounted into the chroot, so it is never safe to use cp -al
-# for these files.
-if [[ -z ${CHROME_DISTDIR} ]] ; then
- CHROME_DISTDIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/${CHROME_SRC}"
-fi
-addwrite "${CHROME_DISTDIR}"
-
-# chrome destination directory
-CHROME_DIR=/opt/google/chrome
-D_CHROME_DIR="${D}/${CHROME_DIR}"
-RELEASE_EXTRA_CFLAGS=()
-
-# For compilation/local chrome
-BUILDTYPE="${BUILDTYPE:-Release}"
-BOARD="${BOARD:-${SYSROOT##/build/}}"
-BUILD_OUT="${BUILD_OUT:-out_${BOARD}}"
-# WARNING: We are using a symlink now for the build directory to work around
-# command line length limits. This will cause problems if you are doing
-# parallel builds of different boards/variants.
-# Unsetting BUILD_OUT_SYM will revert this behavior
-BUILD_OUT_SYM="c"
-
-AFDO_BZ_SUFFIX=".bz2"
-AFDO_LOCATION=${AFDO_GS_DIRECTORY:-"gs://chromeos-prebuilt/afdo-job/canonicals/"}
-
-# This dictionary contains one entry per architecture. The value for each
-# entry is the appropriate AFDO profile for the current version of Chrome.
-declare -A AFDO_FILE
-# The following entries into the AFDO_FILE dictionary are set automatically
-# by the PFQ builder. Don't change the format of the lines or modify by hand.
-AFDO_FILE["amd64"]="chromeos-chrome-amd64-38.0.2092.2.afdo"
-AFDO_FILE["x86"]="chromeos-chrome-amd64-38.0.2092.2.afdo"
-AFDO_FILE["arm"]="chromeos-chrome-amd64-38.0.2092.2.afdo"
-
-add_afdo_files() {
- local a f
- for a in "${!AFDO_FILE[@]}" ; do
- f=${AFDO_FILE[${a}]}
- if [[ -n ${f} ]]; then
- SRC_URI+=" afdo_use? ( ${a}? ( ${AFDO_LOCATION}${f}${AFDO_BZ_SUFFIX} ) )"
- fi
- done
-}
-
-add_afdo_files
-
-RESTRICT="mirror"
-
-RDEPEND="${RDEPEND}
- app-arch/bzip2
- chromeos-base/chromeos-fonts
- dev-libs/atk
- dev-libs/glib
- dev-libs/nspr
- >=dev-libs/nss-3.12.2
- dev-libs/libxml2
- dev-libs/dbus-glib
- x11-libs/cairo
- drm? ( x11-libs/libxkbcommon )
- x11-libs/pango
- >=media-libs/alsa-lib-1.0.19
- media-libs/fontconfig
- media-libs/freetype
- media-libs/libpng
- >=media-sound/adhd-0.0.1-r310
- net-misc/wget
- opengl? ( virtual/opengl )
- opengles? ( virtual/opengles )
- sys-apps/pciutils
- sys-fs/udev
- sys-libs/libcap
- sys-libs/zlib
- X? (
- x11-apps/setxkbmap
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- !arm? ( x11-libs/libva )
- chrome_remoting? ( x11-libs/libXtst )
- )
- evdev_gestures? (
- chromeos-base/gestures
- chromeos-base/libevdev
- )
- accessibility? ( app-accessibility/brltty ) "
-
-
-DEPEND="${DEPEND}
- ${RDEPEND}
- chromeos-base/protofiles
- >=dev-util/gperf-3.0.3
- >=dev-util/pkgconfig-0.23
- arm? ( x11-libs/libdrm )
-"
-
-PATCHES=()
-
-AUTOTEST_COMMON="src/chrome/test/chromeos/autotest/files"
-AUTOTEST_DEPS="${AUTOTEST_COMMON}/client/deps"
-AUTOTEST_DEPS_LIST="chrome_test page_cycler_dep perf_data_dep telemetry_dep"
-
-IUSE="${IUSE} +autotest"
-
-export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
-QA_TEXTRELS="*"
-QA_EXECSTACK="*"
-QA_PRESTRIPPED="*"
-
-use_nacl() {
- # 32bit asan conflicts with nacl: crosbug.com/38980
- ! (use asan && [[ ${ARCH} == "x86" ]]) && \
- ! use component_build && ! use drm && use nacl
-}
-
-# Like the `usex` helper:
-# Usage: echox [int] [echo-if-true] [echo-if-false]
-# If [int] is 0, then echo the 2nd arg (default of yes), else
-# echo the 3rd arg (default of no).
-echox() {
- # Like the `usex` helper.
- [[ ${1:-$?} -eq 0 ]] && echo "${2:-yes}" || echo "${3:-no}"
-}
-echo10() { echox ${1:-$?} 1 0 ; }
-echotf() { echox ${1:-$?} true false ; }
-use10() { usex $1 1 0 ; }
-usetf() { usex $1 true false ; }
-set_build_defines() {
- # General build defines.
- # TODO(vapier): Check that this should say SYSROOT not ROOT
- BUILD_DEFINES=(
- "sysroot=${ROOT}"
- "linux_sandbox_path=${CHROME_DIR}/chrome-sandbox"
- "linux_link_libbrlapi=$(use10 accessibility)"
- "use_brlapi=$(use10 accessibility)"
- "${EXTRA_BUILD_ARGS}"
- "system_libdir=$(get_libdir)"
- "pkg-config=$(tc-getPKG_CONFIG)"
- "use_cups=0"
- "use_gnome_keyring=0"
- "use_vtable_verify=$(use10 vtable_verify)"
- "use_xi2_mt=2"
- "use_ozone=$(use10 ozone)"
- "use_evdev_gestures=$(use10 evdev_gestures)"
- "internal_gles2_conform_tests=$(use10 internal_gles_conform)"
- # Use the ChromeOS toolchain and not the one bundled with Chromium.
- "linux_use_bundled_binutils=0"
- "linux_use_bundled_gold=0"
- "linux_use_gold_flags=$(use10 gold)"
- )
-
- # Disable tcmalloc on ARMv6 since it fails to build (crbug.com/181385)
- [[ ${CHOST} == armv6* ]] && BUILD_DEFINES+=( use_allocator=none )
-
- if use ecs ; then
- BUILD_DEFINES+=(
- "embedded=1"
- )
- else
- BUILD_DEFINES+=(
- swig_defines=-DOS_CHROMEOS
- chromeos=1
- icu_use_data_file_flag=1
- )
- fi
-
- if use ozone; then
- local platform
- for platform in ${IUSE_OZONE_PLATFORMS}; do
- BUILD_DEFINES+=("${platform}=$(use10 ${platform})")
- done
- fi
-
- # Set proper BUILD_DEFINES for the arch
- case "${ARCH}" in
- x86)
- BUILD_DEFINES+=( target_arch=ia32 )
- ;;
- arm)
- BUILD_DEFINES+=(
- target_arch=arm
- arm_float_abi=$(usex hardfp hard softfp)
- arm_neon=$(use10 neon)
- armv7=$([[ ${CHOST} == armv7* ]]; echo10)
- v8_can_use_unaligned_accesses=$([[ ${CHOST} == armv[67]* ]]; echotf)
- v8_can_use_vfp3_instructions=$([[ ${ARM_FPU} == *vfpv[34]* ]]; echotf)
- v8_use_arm_eabi_hardfloat=$(usetf hardfp)
- )
- if [[ -n "${ARM_FPU}" ]]; then
- BUILD_DEFINES+=( arm_fpu="${ARM_FPU}" )
- fi
- ;;
- amd64)
- BUILD_DEFINES+=( target_arch=x64 )
- ;;
- *)
- die "Unsupported architecture: ${ARCH}"
- ;;
- esac
-
- use_nacl || BUILD_DEFINES+=( disable_nacl=1 )
-
- use drm && BUILD_DEFINES+=( use_drm=1 )
-
- # Control inclusion of optional chrome features.
- if use chrome_remoting; then
- BUILD_DEFINES+=( remoting=1 )
- else
- BUILD_DEFINES+=( remoting=0 )
- fi
-
- if use chrome_internal; then
- # Adding chrome branding specific variables and GYP_DEFINES.
- BUILD_DEFINES+=( branding=Chrome buildtype=Official )
- # This test can only be build from internal sources
- BUILD_DEFINES+=( internal_gles2_conform_tests=1 )
- export CHROMIUM_BUILD='_google_Chrome'
- export OFFICIAL_BUILD='1'
- export CHROME_BUILD_TYPE='_official'
-
- # For internal builds, don't remove webcore debug symbols by default.
- REMOVE_WEBCORE_DEBUG_SYMBOLS=${REMOVE_WEBCORE_DEBUG_SYMBOLS:-0}
- elif use chrome_media; then
- echo "Building Chromium with additional media codecs and containers."
- BUILD_DEFINES+=( ffmpeg_branding=ChromeOS proprietary_codecs=1 )
- fi
-
- # This saves time and bytes.
- if [[ "${REMOVE_WEBCORE_DEBUG_SYMBOLS:-1}" == "1" ]]; then
- BUILD_DEFINES+=( remove_webcore_debug_symbols=1 )
- fi
-
- if ! use chrome_debug_tests; then
- BUILD_DEFINES+=( strip_tests=1 )
- fi
-
- if use reorder && ! use clang; then
- BUILD_DEFINES+=( "order_text_section=${CHROME_DISTDIR}/${REORDER_SUBDIR}/section-ordering-files/orderfile-32.0.1665.2" )
- fi
-
- if use clang; then
- if [[ "${ARCH}" == "x86" || "${ARCH}" == "amd64" ]]; then
- BUILD_DEFINES+=(
- clang=1
- clang_use_chrome_plugins=0
- werror=
- use_allocator=none
- )
-
- # The chrome build system will add -m32 for 32bit arches, and
- # clang defaults to 64bit because our cros_sdk is 64bit default.
- export CC="clang" CXX="clang++"
- else
- die "Clang is not yet supported for ${ARCH}"
- fi
- else
- BUILD_DEFINES+=( clang=0 )
- fi
-
- if use asan; then
- if ! use clang; then
- eerror "Asan requires Clang to run."
- die "Please set USE=\"${USE} clang\" to enable Clang"
- fi
- BUILD_DEFINES+=( asan=1 )
- fi
-
- if use component_build; then
- BUILD_DEFINES+=( component=shared_library )
- fi
-
- BUILD_DEFINES+=( "use_cras=1" )
-
- # TODO(davidjames): Pass in all CFLAGS this way, once gyp is smart enough
- # to accept cflags that only apply to the target.
- if use chrome_debug; then
- RELEASE_EXTRA_CFLAGS+=(
- -g
- )
- fi
-
- if use deep_memory_profiler; then
- BUILD_DEFINES+=(
- profiling=1
- profiling_full_stack_frames=1
- linux_dump_symbols=1
- )
- fi
-
- BUILD_DEFINES+=( "release_extra_cflags='${RELEASE_EXTRA_CFLAGS[*]}'" )
-
- export GYP_GENERATORS="$(usex ninja ninja make)"
- export GYP_DEFINES="${BUILD_DEFINES[*]}"
- export builddir_name="${BUILD_OUT}"
- # Prevents gclient from updating self.
- export DEPOT_TOOLS_UPDATE=0
- # Enable std::vector []-operator bounds checking.
- CXXFLAGS+=" -D__google_stl_debug_vector=1"
-}
-
-unpack_chrome() {
- local cmd=( "${CROS_WORKON_SRCROOT}"/chromite/bin/sync_chrome )
- use chrome_internal && cmd+=( --internal )
- if [[ -n "${CROS_SVN_COMMIT}" ]]; then
- cmd+=( --revision="${CROS_SVN_COMMIT}" )
- elif [[ "${CHROME_VERSION}" != "9999" ]]; then
- cmd+=( --tag="${CHROME_VERSION}" )
- fi
- # --reset tells sync_chrome to blow away local changes and to feel
- # free to delete any directories that get in the way of syncing. This
- # is needed for unattended operation.
- cmd+=( --reset --gclient="${EGCLIENT}" "${CHROME_DISTDIR}" )
- elog "${cmd[*]}"
- "${cmd[@]}" || die
-}
-
-decide_chrome_origin() {
- local chrome_workon="=chromeos-base/chromeos-chrome-9999"
- local cros_workon_file="${ROOT}etc/portage/package.keywords/cros-workon"
- if [[ -e "${cros_workon_file}" ]] && grep -q "${chrome_workon}" "${cros_workon_file}"; then
- # LOCAL_SOURCE is the default for cros_workon
- # Warn the user if CHROME_ORIGIN is already set
- if [[ -n "${CHROME_ORIGIN}" && "${CHROME_ORIGIN}" != LOCAL_SOURCE ]]; then
- ewarn "CHROME_ORIGIN is already set to ${CHROME_ORIGIN}."
- ewarn "This will prevent you from building from your local checkout."
- ewarn "Please run 'unset CHROME_ORIGIN' to reset Chrome"
- ewarn "to the default source location."
- fi
- : ${CHROME_ORIGIN:=LOCAL_SOURCE}
- else
- # By default, pull from server
- : ${CHROME_ORIGIN:=SERVER_SOURCE}
- fi
-}
-
-sandboxless_ensure_directory() {
- local dir
- for dir in "$@"; do
- if [[ ! -d "${dir}" ]] ; then
- # We need root access to create these directories, so we need to
- # use sudo. This implicitly disables the sandbox.
- sudo mkdir -p "${dir}" || die
- sudo chown "${PORTAGE_USERNAME}:portage" "${dir}" || die
- sudo chmod 0755 "${dir}" || die
- fi
- done
-}
-
-src_unpack() {
- tc-export CC CXX
- local WHOAMI=$(whoami)
- export EGCLIENT="${EGCLIENT:-/home/${WHOAMI}/depot_tools/gclient}"
- export ENINJA="${ENINJA:-/home/${WHOAMI}/depot_tools/ninja}"
- export DEPOT_TOOLS_UPDATE=0
-
- # Create storage directories.
- sandboxless_ensure_directory "${CHROME_DISTDIR}" "${CHROME_CACHE_DIR}"
-
- # Copy in credentials to fake home directory so that build process
- # can access svn and ssh if needed.
- mkdir -p ${HOME}
- SUBVERSION_CONFIG_DIR=/home/${WHOAMI}/.subversion
- if [[ -d ${SUBVERSION_CONFIG_DIR} ]]; then
- cp -rfp ${SUBVERSION_CONFIG_DIR} ${HOME} || die
- fi
- SSH_CONFIG_DIR=/home/${WHOAMI}/.ssh
- if [[ -d ${SSH_CONFIG_DIR} ]]; then
- cp -rfp ${SSH_CONFIG_DIR} ${HOME} || die
- fi
- NET_CONFIG=/home/${WHOAMI}/.netrc
- if [[ -f ${NET_CONFIG} ]]; then
- cp -fp ${NET_CONFIG} ${HOME} || die
- fi
-
- decide_chrome_origin
-
- case "${CHROME_ORIGIN}" in
- LOCAL_SOURCE|SERVER_SOURCE|LOCAL_BINARY)
- elog "CHROME_ORIGIN VALUE is ${CHROME_ORIGIN}"
- ;;
- *)
- die "CHROME_ORIGIN not one of LOCAL_SOURCE, SERVER_SOURCE, LOCAL_BINARY"
- ;;
- esac
-
- # Prepare and set CHROME_ROOT based on CHROME_ORIGIN.
- # CHROME_ROOT is the location where the source code is used for compilation.
- # If we're in SERVER_SOURCE mode, CHROME_ROOT is CHROME_DISTDIR. In LOCAL_SOURCE
- # mode, this directory may be set manually to any directory. It may be mounted
- # into the chroot, so it is not safe to use cp -al for these files.
- # These are set here because $(whoami) returns the proper user here,
- # but 'root' at the root level of the file
- case "${CHROME_ORIGIN}" in
- (SERVER_SOURCE)
- elog "Using CHROME_VERSION = ${CHROME_VERSION}"
- unpack_chrome
-
- elog "set the chrome source root to ${CHROME_DISTDIR}"
- elog "From this point onwards there is no difference between \
- SERVER_SOURCE and LOCAL_SOURCE, since the fetch is done"
- CHROME_ROOT=${CHROME_DISTDIR}
- ;;
- (LOCAL_SOURCE)
- : ${CHROME_ROOT:=/home/${WHOAMI}/chrome_root}
- if [[ ! -d "${CHROME_ROOT}/src" ]]; then
- die "${CHROME_ROOT} does not contain a valid chromium checkout!"
- fi
- addwrite "${CHROME_ROOT}"
- ;;
- esac
-
- case "${CHROME_ORIGIN}" in
- LOCAL_SOURCE|SERVER_SOURCE)
- set_build_defines
- ;;
- esac
-
- # FIXME: This is the normal path where ebuild stores its working data.
- # Chrome builds inside distfiles because of speed, so we at least make
- # a symlink here to add compatibility with autotest eclass which uses this.
- ln -sf "${CHROME_ROOT}" "${WORKDIR}/${P}"
-
- if use internal_gles_conform; then
- local CHROME_GLES2_CONFORM=${CHROME_ROOT}/src/third_party/gles2_conform
- local CROS_GLES2_CONFORM=/home/${WHOAMI}/trunk/src/third_party/gles2_conform
- if [[ ! -d "${CHROME_GLES2_CONFORM}" ]]; then
- if [[ -d "${CROS_GLES2_CONFORM}" ]]; then
- ln -s "${CROS_GLES2_CONFORM}" "${CHROME_GLES2_CONFORM}"
- einfo "Using GLES2 conformance test suite from ${CROS_GLES2_CONFORM}"
- else
- die "Trying to build GLES2 conformance test suite without ${CHROME_GLES2_CONFORM} or ${CROS_GLES2_CONFORM}"
- fi
- fi
- fi
-
- if use afdo_use && ! use clang; then
- local PROFILE_DIR="${WORKDIR}/afdo"
- mkdir "${PROFILE_DIR}"
- pushd "${PROFILE_DIR}" > /dev/null
-
- local PROFILE_FILE="${AFDO_FILE[${ARCH}]}"
- [[ -n ${PROFILE_FILE} ]] || die "Missing AFDO profile for ${ARCH}"
- unpack "${PROFILE_FILE}${AFDO_BZ_SUFFIX}"
- popd > /dev/null
-
- local PROFILE_LOC="${PROFILE_DIR}/${PROFILE_FILE}"
- append-flags -fauto-profile=${PROFILE_LOC}
-
- # This is required because gcc emits different warnings
- # for AFDO vs. non-AFDO. AFDO may inline different
- # functions from non-AFDO, leading to different warnings.
- append-flags -Wno-error
- einfo "Using AFDO data from ${PROFILE_LOC}"
- fi
-
- if use reorder && ! use clang; then
- EGIT_REPO_URI="${CROS_GIT_HOST_URL}/chromiumos/profile/chromium.git"
- EGIT_COMMIT="067dd0d802bc815703c7908c72659f2483be0e3a"
- EGIT_PROJECT="${PN}-reorder"
- if grep -qs ${EGIT_COMMIT} "${CHROME_DISTDIR}/${REORDER_SUBDIR}/.git/HEAD"; then
- einfo "Reorder profile repo is up to date."
- else
- einfo "Reorder profile repo not up-to-date. Fetching..."
- EGIT_SOURCEDIR="${CHROME_DISTDIR}/${REORDER_SUBDIR}"
- rm -rf "${EGIT_SOURCEDIR}"
- git-2_src_unpack
- fi
- fi
-}
-
-src_prepare() {
- if [[ "${CHROME_ORIGIN}" != "LOCAL_SOURCE" &&
- "${CHROME_ORIGIN}" != "SERVER_SOURCE" ]]; then
- return
- fi
-
- elog "${CHROME_ROOT} should be set here properly"
- cd "${CHROME_ROOT}/src" || die "Cannot chdir to ${CHROME_ROOT}"
-
- # We do symlink creation here if appropriate.
- mkdir -p "${CHROME_CACHE_DIR}/src/${BUILD_OUT}"
- if [[ ! -z "${BUILD_OUT_SYM}" ]]; then
- rm -rf "${BUILD_OUT_SYM}" || die "Could not remove symlink"
- ln -sfT "${CHROME_CACHE_DIR}/src/${BUILD_OUT}" "${BUILD_OUT_SYM}" ||
- die "Could not create symlink for output directory"
- export builddir_name="${BUILD_OUT_SYM}"
- fi
-
-
- # Apply patches for non-localsource builds.
- if [[ "${CHROME_ORIGIN}" == "SERVER_SOURCE" && ${#PATCHES[@]} -gt 0 ]]; then
- epatch "${PATCHES[@]}"
- fi
-
- # The chrome makefiles specify -O and -g flags already, so remove the
- # portage flags.
- filter-flags -g -O*
-
- local WHOAMI=$(whoami)
- # The hooks may depend on the environment variables we set in this
- # ebuild (i.e., GYP_DEFINES for gyp_chromium)
- ECHROME_SET_VER=${ECHROME_SET_VER:=/home/${WHOAMI}/trunk/chromite/bin/chrome_set_ver}
- einfo "Building Chrome with the following define options:"
- local opt
- for opt in "${BUILD_DEFINES[@]}"; do
- einfo "${opt}"
- done
-
- # Get the credentials to fake home directory so that the version of chromium
- # we build can access Google services. First, check for Chrome credentials.
- if [[ ! -d google_apis/internal ]]; then
- # Then look for ChromeOS supplied credentials.
- local PRIVATE_OVERLAYS_DIR=/home/${WHOAMI}/trunk/src/private-overlays
- local GAPI_CONFIG_FILE=${PRIVATE_OVERLAYS_DIR}/chromeos-overlay/googleapikeys
- # RE to match the allowed names.
- local NRE="('google_(api_key|default_client_(id|secret))')"
- # RE to match whitespace.
- local WS="[[:space:]]*"
- # RE to match allowed values.
- local CRE="('[^\\\\']*')"
- # And combining them into one RE for describing the lines
- # we want to allow.
- local TRE="^${WS}${NRE}${WS}[:=]${WS}${CRE}.*"
- if [[ ! -f "${GAPI_CONFIG_FILE}" ]]; then
- # Then developer credentials.
- GAPI_CONFIG_FILE=/home/${WHOAMI}/.googleapikeys
- fi
- if [[ -f "${GAPI_CONFIG_FILE}" ]]; then
- mkdir "${HOME}"/.gyp
- cat <<-EOF >"${HOME}/.gyp/include.gypi"
- {
- 'variables': {
- $(sed -nr -e "/^${TRE}/{s//\1: \4,/;p;}" \
- "${GAPI_CONFIG_FILE}")
- }
- }
- EOF
- fi
- fi
-}
-
-setup_test_lists() {
- TEST_FILES=(
- libffmpegsumo.so
- media_unittests
- sandbox_linux_unittests
- ppapi_example_video_decode
- )
-
- # TODO(spang): video tests don't build with ozone - crbug.com/363302
- if ! use ozone; then
- TEST_FILES+=( video_decode_accelerator_unittest )
-
- # TODO(owenlin): Remove the test once VEA is ready on x86 platforms.
- if [[ ${ARCH} == "arm" ]]; then
- TEST_FILES+=( video_encode_accelerator_unittest )
- fi
- fi
-
- if use chrome_internal || use internal_gles_conform; then
- TEST_FILES+=(
- gles2_conform_test{,_windowless}
- )
- fi
-
- PPAPI_TEST_FILES=(
- lib{32,64}
- mock_nacl_gdb
- ppapi_nacl_tests_{newlib,glibc}.nmf
- ppapi_nacl_tests_{newlib,glibc}_{x32,x64,arm}.nexe
- test_case.html
- test_case.html.mock-http-headers
- test_page.css
- test_url_loader_data
- )
-}
-
-src_configure() {
- tc-export CXX CC AR AS RANLIB STRIP
- if use clang; then
- export CC_host="clang"
- export CXX_host="clang++"
- else
- export CC_host=$(tc-getBUILD_CC)
- export CXX_host=$(tc-getBUILD_CXX)
- fi
- export AR_host=$(tc-getBUILD_AR)
- if use gold ; then
- if [[ "${GOLD_SET}" != "yes" ]]; then
- export GOLD_SET="yes"
- einfo "Using gold from the following location: $(get_binutils_path_gold)"
- export CC="${CC} -B$(get_binutils_path_gold)"
- export CXX="${CXX} -B$(get_binutils_path_gold)"
- fi
- else
- ewarn "gold disabled. Using GNU ld."
- fi
-
- # Use g++ as the linker driver.
- export LD="${CXX}"
- export LD_host=$(tc-getBUILD_CXX)
-
- local build_tool_flags=()
- if use ninja; then
- build_tool_flags+=(
- "config=${BUILDTYPE}"
- "output_dir=${builddir_name}"
- )
- fi
- export GYP_GENERATOR_FLAGS="${build_tool_flags[*]}"
- export BOTO_CONFIG=/home/$(whoami)/.boto
- export PATH=${PATH}:/home/$(whoami)/depot_tools
-
- # TODO(rcui): crosbug.com/20435. Investigate removal of runhooks
- # useflag when chrome build switches to Ninja inside the chroot.
- if use runhooks; then
- if [[ ! -f .gclient ]]; then
- # Probably a git submodules checkout
- git runhooks --force || die "Failed to run git runhooks"
- else
- [[ -n "${EGCLIENT}" ]] || die EGCLIENT unset
- [[ -f "${EGCLIENT}" ]] || die EGCLIENT at "${EGCLIENT}" does not exist
- "${EGCLIENT}" runhooks --force || die "Failed to run ${EGCLIENT} runhooks"
- fi
- fi
- use vtable_verify && append-ldflags -fvtable-verify=preinit
-
- setup_test_lists
-}
-
-chrome_make() {
- if use ninja; then
- PATH=${PATH}:/home/$(whoami)/depot_tools ${ENINJA} \
- ${MAKEOPTS} -C "${BUILD_OUT_SYM}/${BUILDTYPE}" $(usex verbose -v "") "$@" || die
- else
- emake -r $(usex verbose V=1 "") "BUILDTYPE=${BUILDTYPE}" "$@" || die
- fi
-}
-
-src_compile() {
- if [[ "${CHROME_ORIGIN}" != "LOCAL_SOURCE" &&
- "${CHROME_ORIGIN}" != "SERVER_SOURCE" ]]; then
- return
- fi
-
- cd "${CHROME_ROOT}"/src || die "Cannot chdir to ${CHROME_ROOT}/src"
-
- local chrome_targets=()
-
- if [[ -n "${CHROME_TARGET_OVERRIDE}" ]]; then
- chrome_targets=( ${CHROME_TARGET_OVERRIDE} )
- einfo "Building custom targets: ${chrome_targets[*]}"
- elif use ecs; then
- chrome_targets=( content_shell chrome_sandbox )
- einfo "Building embedded content_shell"
- elif use app_shell; then
- chrome_targets=( app_shell chrome_sandbox libosmesa.so )
- einfo "Building app_shell"
- else
- chrome_targets=( chrome chrome_sandbox )
- if use build_tests; then
- chrome_targets+=( "${TEST_FILES[@]}"
- chromedriver )
- einfo "Building test targets: ${TEST_FILES[@]}"
- fi
-
- if use_nacl; then
- chrome_targets+=( nacl_helper_bootstrap nacl_helper )
- fi
-
- if use drm; then
- chrome_targets+=( aura_demo ash_shell )
- else
- chrome_targets+=( libosmesa.so )
- fi
- fi
- if use mojo; then
- chrome_targets+=( mojo_shell )
- fi
-
- chrome_make "${chrome_targets[@]}"
-
- if use build_tests; then
- install_chrome_test_resources "${WORKDIR}/test_src"
- install_page_cycler_dep_resources "${WORKDIR}/page_cycler_src"
- install_perf_data_dep_resources "${WORKDIR}/perf_data_src"
- install_telemetry_dep_resources "${WORKDIR}/telemetry_src"
-
- # NOTE: Since chrome is built inside distfiles, we have to get
- # rid of the previous instance first.
- # We remove only what we will overwrite with the mv below.
- local deps="${WORKDIR}/${P}/${AUTOTEST_DEPS}"
-
- rm -rf "${deps}/chrome_test/test_src"
- mv "${WORKDIR}/test_src" "${deps}/chrome_test/"
-
- rm -rf "${deps}/page_cycler_dep/test_src"
- mv "${WORKDIR}/page_cycler_src" "${deps}/page_cycler_dep/test_src"
-
- rm -rf "${deps}/perf_data_dep/test_src"
- mv "${WORKDIR}/perf_data_src" "${deps}/perf_data_dep/test_src"
-
- rm -rf "${deps}/telemetry_dep/test_src"
- mv "${WORKDIR}/telemetry_src" "${deps}/telemetry_dep/test_src"
-
- # HACK: It would make more sense to call autotest_src_prepare in
- # src_prepare, but we need to call install_chrome_test_resources first.
- autotest-deponly_src_prepare
-
- # Remove .svn dirs
- esvn_clean "${AUTOTEST_WORKDIR}"
- # Remove .git dirs
- find "${AUTOTEST_WORKDIR}" -type d -name .git -prune -exec rm -rf {} +
-
- autotest_src_compile
- fi
-}
-
-# Turn off the cp -l behavior in autotest, since the source dir and the
-# installation dir live on different bind mounts right now.
-fast_cp() {
- cp "$@"
-}
-
-install_test_resources() {
- # Install test resources from chrome source directory to destination.
- # We keep a cache of test resources inside the chroot to avoid copying
- # multiple times.
- local test_dir="${1}"
- shift
- local resource cache dest
- for resource in "$@"; do
- cache=$(dirname "${CHROME_CACHE_DIR}/src/${resource}")
- dest=$(dirname "${test_dir}/${resource}")
- mkdir -p "${cache}" "${dest}"
- rsync -a --delete --exclude=.svn --exclude=.git \
- "${CHROME_ROOT}/src/${resource}" "${cache}"
- cp -al "${CHROME_CACHE_DIR}/src/${resource}" "${dest}"
- done
-}
-
-install_chrome_test_resources() {
- # NOTE: This is a duplicate from src_install, because it's required here.
- local from="${CHROME_CACHE_DIR}/src/${BUILD_OUT}/${BUILDTYPE}"
- local test_dir="${1}"
-
- echo Copying Chrome tests into "${test_dir}"
- mkdir -p "${test_dir}/out/Release"
-
- # Even if chrome_debug_tests is enabled, we don't need to include detailed
- # debug info for tests in the binary package, so save some time by stripping
- # everything but the symbol names. Developers who need more detailed debug
- # info on the tests can use the original unstripped tests from the ${from}
- # directory.
- TEST_INSTALL_TARGETS=( "${TEST_FILES[@]}"
- "libppapi_tests.so"
- "chrome_sandbox" )
-
- einfo "Installing test targets: ${TEST_INSTALL_TARGETS[@]}"
- for f in "${TEST_INSTALL_TARGETS[@]}"; do
- $(tc-getSTRIP) --strip-debug \
- --keep-file-symbols "${from}"/${f} \
- -o "${test_dir}/out/Release/$(basename ${f})"
- done
-
- # Copy Chrome test data.
- mkdir "${test_dir}"/out/Release/test_data
- # WARNING: Only copy subdirectories of |test_data|.
- # The full |test_data| directory is huge and kills our VMs.
- # Example:
- # cp -al "${from}"/test_data/<subdir> "${test_dir}"/out/Release/<subdir>
-
- # Add the fake bidi locale.
- mkdir "${test_dir}"/out/Release/pseudo_locales
- cp -al "${from}"/pseudo_locales/fake-bidi.pak \
- "${test_dir}"/out/Release/pseudo_locales
-
- for f in "${PPAPI_TEST_FILES[@]}"; do
- cp -al "${from}/${f}" "${test_dir}/out/Release"
- done
-
- # Install Chrome test resources.
- # WARNING: Only install subdirectories of |chrome/test|.
- # The full |chrome/test| directory is huge and kills our VMs.
- install_test_resources "${test_dir}" \
- base/base_paths_posix.cc \
- chrome/test/data/chromeos \
- chrome/test/functional \
- chrome/third_party/mock4js/mock4js.js \
- content/common/gpu/testdata \
- media/test/data \
- content/test/data \
- net/data/ssl/certificates \
- ppapi/tests/test_case.html \
- ppapi/tests/test_url_loader_data \
- third_party/bidichecker/bidichecker_packaged.js \
- third_party/accessibility-developer-tools/gen/axs_testing.js
-
- # Add the pdf test data if needed.
- if use chrome_internal; then
- install_test_resources "${test_dir}" pdf/test
- fi
- # Add the gles_conform test data if needed.
- if use chrome_internal || use internal_gles_conform; then
- install_test_resources "${test_dir}" gpu/gles2_conform_support/gles2_conform_test_expectations.txt
- fi
-
- # Remove test binaries from other platforms.
- if [[ -z "${E_MACHINE}" ]]; then
- echo E_MACHINE not defined!
- else
- cd "${test_dir}"/chrome/test
- rm -fv $( scanelf -RmyBF%a . | grep -v -e ^${E_MACHINE} )
- fi
-
- cp -a "${CHROME_ROOT}"/"${AUTOTEST_DEPS}"/chrome_test/setup_test_links.sh \
- "${test_dir}"/out/Release
-}
-
-install_page_cycler_dep_resources() {
- local test_dir="${1}"
-
- if [[ -r "${CHROME_ROOT}/src/data/page_cycler" ]]; then
- echo "Copying Page Cycler Data into ${test_dir}"
- mkdir -p "${test_dir}"
- install_test_resources "${test_dir}" \
- data/page_cycler
- fi
-}
-
-install_perf_data_dep_resources() {
- local test_dir="${1}"
-
- if [[ -r "${CHROME_ROOT}/src/tools/perf/data" ]]; then
- echo "Copying Perf Data into ${test_dir}"
- mkdir -p "${test_dir}"
- install_test_resources "${test_dir}" tools/perf/data
- fi
-}
-
-install_telemetry_dep_resources() {
- local test_dir="${1}"
-
- if [[ -r "${CHROME_ROOT}/src/tools/telemetry" ]]; then
- echo "Copying Telemetry Framework into ${test_dir}"
- mkdir -p "${test_dir}"
- DEPS_LIST=$(python ${FILESDIR}/get_telemetry_deps.py ${CHROME_ROOT})
- install_test_resources "${test_dir}" $DEPS_LIST \
- content/test/data/gpu \
- content/test/data/media \
- content/test/gpu/run_gpu_test.py \
- tools/perf/run_benchmark \
- tools/perf/run_measurement \
- tools/perf/run_multipage_benchmarks \
- tools/perf/run_tests \
- chrome/test/telemetry
- fi
- # When copying only a portion of the Chrome source that telemetry needs,
- # some symlinks can end up broken. Thus clean these up before packaging.
- find -L "${test_dir}" -type l -delete
-}
-
-
-# Add any new artifacts generated by the Chrome build targets to deploy_chrome.py.
-# We deal with miscellaneous artifacts here in the ebuild.
-src_install() {
- FROM="${CHROME_CACHE_DIR}/src/${BUILD_OUT}/${BUILDTYPE}"
-
- # Override default strip flags and lose the '-R .comment'
- # in order to play nice with the crash server.
- if [[ -z "${KEEP_CHROME_DEBUG_SYMBOLS}" ]]; then
- export PORTAGE_STRIP_FLAGS="--strip-unneeded"
- else
- export PORTAGE_STRIP_FLAGS="--strip-debug --keep-file-symbols"
- fi
-
- # Copy org.chromium.LibCrosService.conf, the D-Bus config file for the
- # D-Bus service exported by Chrome.
- insinto /etc/dbus-1/system.d
- DBUS="${CHROME_ROOT}"/src/chrome/browser/chromeos/dbus
- doins "${DBUS}"/org.chromium.LibCrosService.conf
-
- # Copy Quickoffice resources for official build.
- if use chrome_internal; then
- insinto /usr/share/chromeos-assets/quickoffice
- QUICKOFFICE="${CHROME_ROOT}"/src/chrome/browser/resources/chromeos/quickoffice
- doins -r "${QUICKOFFICE}"/_locales
- doins -r "${QUICKOFFICE}"/css
- doins -r "${QUICKOFFICE}"/img
- doins -r "${QUICKOFFICE}"/plugin
- doins -r "${QUICKOFFICE}"/scripts
- doins -r "${QUICKOFFICE}"/views
-
- insinto /usr/share/chromeos-assets/quickoffice/_platform_specific
- case "${ARCH}" in
- arm)
- doins -r "${QUICKOFFICE}"/_platform_specific/arm
- ;;
- x86)
- doins -r "${QUICKOFFICE}"/_platform_specific/x86_32
- ;;
- amd64)
- doins -r "${QUICKOFFICE}"/_platform_specific/x86_64
- ;;
- *)
- die "Unsupported architecture: ${ARCH}"
- ;;
- esac
- fi
-
- # Chrome test resources
- # Test binaries are only available when building chrome from source
- if use build_tests && [[ "${CHROME_ORIGIN}" == "LOCAL_SOURCE" ||
- "${CHROME_ORIGIN}" == "SERVER_SOURCE" ]]; then
- autotest-deponly_src_install
- #env -uRESTRICT prepstrip "${D}${AUTOTEST_BASE}"
- fi
-
- # Fix some perms.
- # TODO(rcui): Remove this - shouldn't be needed, and is just covering up
- # potential permissions bugs.
- chmod -R a+r "${D}"
- find "${D}" -perm /111 -print0 | xargs -0 chmod a+x
-
- # The following symlinks are needed in order to run chrome.
- # TODO(rcui): Remove this. Not needed for running Chrome.
- dosym libnss3.so /usr/lib/libnss3.so.1d
- dosym libnssutil3.so.12 /usr/lib/libnssutil3.so.1d
- dosym libsmime3.so.12 /usr/lib/libsmime3.so.1d
- dosym libssl3.so.12 /usr/lib/libssl3.so.1d
- dosym libplds4.so /usr/lib/libplds4.so.0d
- dosym libplc4.so /usr/lib/libplc4.so.0d
- dosym libnspr4.so /usr/lib/libnspr4.so.0d
-
- # Create the main Chrome install directory.
- dodir "${CHROME_DIR}"
- insinto "${CHROME_DIR}"
-
- # Enable the chromeos local account, if the environment dictates.
- if [[ -n "${CHROMEOS_LOCAL_ACCOUNT}" ]]; then
- echo "${CHROMEOS_LOCAL_ACCOUNT}" > "${T}/localaccount"
- doins "${T}/localaccount"
- fi
-
- # Use the deploy_chrome from the *Chrome* checkout. The
- # benefit of doing this is if a new buildspec of Chrome requires a
- # non-backwards compatible change to deploy_chrome, we can commit the
- # fix to deploy_chrome without breaking existing Chrome OS release builds,
- # and then roll the DEPS for chromite in the Chrome checkout.
- #
- # Another benefit is each version of Chrome will have the right
- # corresponding version of deploy_chrome.
- local cmd=( "${CHROME_ROOT}"/src/third_party/chromite/bin/deploy_chrome )
- # Disable stripping for now, as deploy_chrome doesn't generate splitdebug files.
- cmd+=(
- --board="${BOARD}"
- --build-dir="${FROM}"
- --gyp-defines="${GYP_DEFINES}"
- # If this is enabled, we need to re-enable `prepstrip` above for autotests.
- # You'll also have to re-add "strip" to the RESTRICT at the top of the file.
- --nostrip
- --staging-dir="${D_CHROME_DIR}"
- --staging-flags="${USE}"
- --staging-only
- --strict
- --strip-bin="${STRIP}"
- --strip-flags="${PORTAGE_STRIP_FLAGS}"
- --verbose
- )
- einfo "${cmd[*]}"
- "${cmd[@]}" || die
-
- if use build_tests && ! use ecs; then
- # Install Chrome Driver to test image.
- local chromedriver_dir='/usr/local/chromedriver'
- dodir "${chromedriver_dir}"
- cp -pPR "${FROM}"/chromedriver "${D}/${chromedriver_dir}" || die
- fi
-}
diff --git a/chromeos-base/chromeos-chrome/chromeos-chrome-39.0.2138.3_rc-r1.ebuild b/chromeos-base/chromeos-chrome/chromeos-chrome-39.0.2160.2_rc-r1.ebuild
similarity index 98%
rename from chromeos-base/chromeos-chrome/chromeos-chrome-39.0.2138.3_rc-r1.ebuild
rename to chromeos-base/chromeos-chrome/chromeos-chrome-39.0.2160.2_rc-r1.ebuild
index 90c6923..3a28916 100644
--- a/chromeos-base/chromeos-chrome/chromeos-chrome-39.0.2138.3_rc-r1.ebuild
+++ b/chromeos-base/chromeos-chrome/chromeos-chrome-39.0.2160.2_rc-r1.ebuild
@@ -121,9 +121,9 @@
declare -A AFDO_FILE
# The following entries into the AFDO_FILE dictionary are set automatically
# by the PFQ builder. Don't change the format of the lines or modify by hand.
-AFDO_FILE["amd64"]="chromeos-chrome-amd64-39.0.2138.3_rc-r1.afdo"
-AFDO_FILE["x86"]="chromeos-chrome-amd64-39.0.2138.3_rc-r1.afdo"
-AFDO_FILE["arm"]="chromeos-chrome-amd64-39.0.2138.3_rc-r1.afdo"
+AFDO_FILE["amd64"]="chromeos-chrome-amd64-39.0.2160.2_rc-r1.afdo"
+AFDO_FILE["x86"]="chromeos-chrome-amd64-39.0.2160.2_rc-r1.afdo"
+AFDO_FILE["arm"]="chromeos-chrome-amd64-39.0.2160.2_rc-r1.afdo"
add_afdo_files() {
local a f
@@ -261,8 +261,14 @@
if use ozone; then
local platform
+ if [[ -n "${OZONE_PLATFORM_DEFAULT}" ]]; then
+ BUILD_DEFINES+=("ozone_platform=${OZONE_PLATFORM_DEFAULT}")
+ fi
+ BUILD_DEFINES+=("ozone_auto_platforms=0")
for platform in ${IUSE_OZONE_PLATFORMS}; do
- BUILD_DEFINES+=("${platform}=$(use10 ${platform})")
+ if use "${platform}"; then
+ BUILD_DEFINES+=("${platform}=1")
+ fi
done
fi
diff --git a/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild b/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild
index 220596e..778c293 100644
--- a/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild
+++ b/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild
@@ -121,9 +121,9 @@
declare -A AFDO_FILE
# The following entries into the AFDO_FILE dictionary are set automatically
# by the PFQ builder. Don't change the format of the lines or modify by hand.
-AFDO_FILE["amd64"]="chromeos-chrome-amd64-39.0.2138.3_rc-r1.afdo"
-AFDO_FILE["x86"]="chromeos-chrome-amd64-39.0.2138.3_rc-r1.afdo"
-AFDO_FILE["arm"]="chromeos-chrome-amd64-39.0.2138.3_rc-r1.afdo"
+AFDO_FILE["amd64"]="chromeos-chrome-amd64-39.0.2160.2_rc-r1.afdo"
+AFDO_FILE["x86"]="chromeos-chrome-amd64-39.0.2160.2_rc-r1.afdo"
+AFDO_FILE["arm"]="chromeos-chrome-amd64-39.0.2160.2_rc-r1.afdo"
add_afdo_files() {
local a f
@@ -261,8 +261,14 @@
if use ozone; then
local platform
+ if [[ -n "${OZONE_PLATFORM_DEFAULT}" ]]; then
+ BUILD_DEFINES+=("ozone_platform=${OZONE_PLATFORM_DEFAULT}")
+ fi
+ BUILD_DEFINES+=("ozone_auto_platforms=0")
for platform in ${IUSE_OZONE_PLATFORMS}; do
- BUILD_DEFINES+=("${platform}=$(use10 ${platform})")
+ if use "${platform}"; then
+ BUILD_DEFINES+=("${platform}=1")
+ fi
done
fi
