Delete ChromeOS code
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1926163002
Review-Url: https://codereview.chromium.org/1926163002
diff --git a/.gitignore b/.gitignore
index 92687a6..34f6f27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,8 +20,6 @@
platform_tools/android/apps/*.properties
platform_tools/android/apps/*/build
platform_tools/android/apps/*/src/main/libs
-platform_tools/chromeos/third_party/externals
-platform_tools/chromeos/toolchain
sampleapp_prefs.txt
/skps
skia.conf
diff --git a/DEPS b/DEPS
index b06c80b..1b38961 100644
--- a/DEPS
+++ b/DEPS
@@ -31,8 +31,6 @@
"third_party/externals/expat" : "https://android.googlesource.com/platform/external/expat.git@android-5.1.0_r3",
- "platform_tools/chromeos/toolchain/src/third_party/chromite": "https://chromium.googlesource.com/chromiumos/chromite.git@d6a4c7e0ee4d53ddc5238dbddfc0417796a70e54",
- "platform_tools/chromeos/toolchain/src/third_party/pyelftools": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git@bdc1d380acd88d4bfaf47265008091483b0d614e",
# The line below is needed for compiling SkV8Example. Do not delete.
#"third_party/externals/v8": "https://chromium.googlesource.com/v8/v8.git@5f1ae66d5634e43563b2d25ea652dfb94c31a3b4",
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index 52061f2..ea7ab98 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -254,14 +254,6 @@
'android_deps.gyp:Android_SampleApp',
],
}],
- [ 'skia_os == "chromeos"', {
- 'sources!': [
- '../samplecode/SampleLighting.cpp', #doesn't compile due to gpu dependencies
- ],
- 'include_dirs' : [
- '../include/gpu',
- ],
- }],
[ 'skia_gpu == 1', {
'dependencies': [
'gputest.gyp:skgputest',
diff --git a/gyp/codec.gyp b/gyp/codec.gyp
index a31c1cc..bea740b 100644
--- a/gyp/codec.gyp
+++ b/gyp/codec.gyp
@@ -135,11 +135,6 @@
'OTHER_CPLUSPLUSFLAGS': ['-fexceptions'],
},
}],
- ['skia_os == "chromeos"', {
- 'link_settings': {
- 'libraries': ['-lrt', ],
- },
- }],
],
},
],
diff --git a/gyp/common.gypi b/gyp/common.gypi
index 9ca2895..757d9c2 100644
--- a/gyp/common.gypi
+++ b/gyp/common.gypi
@@ -26,8 +26,7 @@
# situations, like building for iOS on a Mac.
'variables': {
'conditions': [
- [ 'skia_os != OS and not ((skia_os == "ios" and OS == "mac") or \
- (skia_os == "chromeos" and OS == "linux"))', {
+ [ 'skia_os != OS and not (skia_os == "ios" and OS == "mac")', {
'error': '<!(Cannot build with skia_os=<(skia_os) on OS=<(OS))',
}],
[ 'skia_mesa and skia_os not in ["mac", "linux"]', {
@@ -36,9 +35,6 @@
[ 'skia_angle and not (skia_os == "win" or skia_os == "linux" or skia_os == "mac")', {
'error': '<!(skia_angle=1 only supported with skia_os="win" or skia_os="linux" or skia_os="mac".)',
}],
- [ 'skia_os == "chromeos" and OS != "linux"', {
- 'error': '<!(Skia ChromeOS build is only supported on Linux.)',
- }],
],
},
'includes': [
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index aee65da..0f8fa51 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -218,7 +218,7 @@
],
# The following section is common to linux + derivatives and android
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos", "android"]',
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android"]',
{
'cflags': [
'-g',
@@ -242,24 +242,20 @@
'ldflags': [ '-rdynamic' ],
'conditions': [
[ 'skia_fast', { 'cflags': [ '<@(skia_fast_flags)' ] }],
- [ 'skia_os != "chromeos"', {
- 'conditions': [
- [ 'skia_arch_type == "x86_64" and not skia_android_framework', {
- 'cflags': [
- '-m64',
- ],
- 'ldflags': [
- '-m64',
- ],
- }],
- [ 'skia_arch_type == "x86" and not skia_android_framework', {
- 'cflags': [
- '-m32',
- ],
- 'ldflags': [
- '-m32',
- ],
- }],
+ [ 'skia_arch_type == "x86_64" and not skia_android_framework', {
+ 'cflags': [
+ '-m64',
+ ],
+ 'ldflags': [
+ '-m64',
+ ],
+ }],
+ [ 'skia_arch_type == "x86" and not skia_android_framework', {
+ 'cflags': [
+ '-m32',
+ ],
+ 'ldflags': [
+ '-m32',
],
}],
[ 'skia_warnings_as_errors', {
@@ -298,7 +294,7 @@
'SK_ARM_HAS_OPTIONAL_NEON',
],
}],
- [ 'skia_os != "chromeos" and skia_os != "linux"', {
+ [ 'skia_os != "linux"', {
'cflags': [
'-mfloat-abi=softfp',
],
@@ -409,7 +405,7 @@
'defines': [ 'SK_DUMP_STATS'],
}],
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]',
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]',
{
'defines': [
'SK_SAMPLES_FOR_X',
diff --git a/gyp/core.gyp b/gyp/core.gyp
index b0cbbf9..e6f7e8c 100644
--- a/gyp/core.gyp
+++ b/gyp/core.gyp
@@ -36,7 +36,7 @@
],
'msvs_disabled_warnings': [4244, 4267,4345, 4390, 4554, 4800],
'conditions': [
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
'link_settings': {
'libraries': [
'-lpthread',
diff --git a/gyp/debugger.gyp b/gyp/debugger.gyp
index f6e1988..8ad5702 100644
--- a/gyp/debugger.gyp
+++ b/gyp/debugger.gyp
@@ -6,7 +6,7 @@
'variables': {
'skia_warnings_as_errors': 0,
'conditions': [
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
# Use the systemwide Qt libs by default
'variables': {
'qt_sdk%': '/usr',
diff --git a/gyp/everything.gyp b/gyp/everything.gyp
index 47db978..299aad5 100644
--- a/gyp/everything.gyp
+++ b/gyp/everything.gyp
@@ -21,7 +21,7 @@
'skiaserve.gyp:skiaserve',
],
'conditions': [
- ['skia_os in ("ios", "android", "chromeos")', {
+ ['skia_os in ("ios", "android")', {
# debugger is not supported on this platform
}, {
'dependencies': [
diff --git a/gyp/freetype.gyp b/gyp/freetype.gyp
index d68d33a..6ebd168 100644
--- a/gyp/freetype.gyp
+++ b/gyp/freetype.gyp
@@ -33,7 +33,7 @@
}, { # (not skia_freetype_static)
# dynamic linking depends on the OS:
'conditions': [
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]',
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]',
{
'direct_dependent_settings': {
'include_dirs' : [
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 2fedbed..f09bcd0 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -14,7 +14,7 @@
'sources/': [ ['exclude', '_mac.(h|cpp|m|mm)$'],
],
}],
- ['skia_os != "linux" and skia_os != "chromeos"', {
+ ['skia_os != "linux"', {
'sources/': [ ['exclude', '_glx.(h|cpp)$'],
],
}],
@@ -123,13 +123,13 @@
'GR_CHROME_UTILS=1',
],
}],
- [ 'skia_os == "linux" or skia_os == "chromeos"', {
+ [ 'skia_os == "linux"', {
'sources!': [
'../src/gpu/gl/GrGLDefaultInterface_none.cpp',
'../src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
],
}],
- [ '(skia_os == "linux" or skia_os == "chromeos") and skia_egl == 1', {
+ [ 'skia_os == "linux" and skia_egl == 1', {
'link_settings': {
'libraries': [
'-lEGL',
@@ -137,7 +137,7 @@
],
},
}],
- [ '(skia_os == "linux" or skia_os == "chromeos") and skia_egl == 0', {
+ [ 'skia_os == "linux" and skia_egl == 0', {
'link_settings': {
'libraries': [
'-lGL',
diff --git a/gyp/gputest.gyp b/gyp/gputest.gyp
index d1067e5..746fea1 100644
--- a/gyp/gputest.gyp
+++ b/gyp/gputest.gyp
@@ -41,7 +41,7 @@
'angle.gyp:*',
],
}],
- [ '(skia_os == "linux" or skia_os == "chromeos") and skia_egl == 1', {
+ [ 'skia_os == "linux" and skia_egl == 1', {
'link_settings': {
'libraries': [
'-lEGL',
@@ -49,7 +49,7 @@
],
},
}],
- [ '(skia_os == "linux" or skia_os == "chromeos") and skia_egl == 0', {
+ [ 'skia_os == "linux" and skia_egl == 0', {
'link_settings': {
'libraries': [
'-lGL',
@@ -69,7 +69,7 @@
],
},
}],
- ['skia_os in ["linux", "win", "mac", "chromeos", "android", "ios"]', {
+ ['skia_os in ["linux", "win", "mac", "android", "ios"]', {
'sources/': [ ['exclude', '_none\.(h|cpp)$'],],
}],
['skia_os != "win"', {
@@ -78,7 +78,7 @@
['skia_os != "mac"', {
'sources/': [ ['exclude', '_mac\.(h|cpp|m|mm)$'],],
}],
- ['skia_os != "linux" and skia_os != "chromeos"', {
+ ['skia_os != "linux"', {
'sources/': [ ['exclude', '_glx\.(h|cpp)$'],],
}],
['skia_os != "ios"', {
diff --git a/gyp/icu.gyp b/gyp/icu.gyp
index 5142b77..4a98503 100644
--- a/gyp/icu.gyp
+++ b/gyp/icu.gyp
@@ -112,7 +112,7 @@
}
],
[
- 'skia_os in ["linux", "chromeos"]', {
+ 'skia_os == "linux"', {
'sources': [ '<(icu_directory)/linux/icudtl_dat.S', ],
}
],
diff --git a/gyp/images.gyp b/gyp/images.gyp
index 2701b50..8920f6a 100644
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -107,11 +107,6 @@
}],
],
}],
- [ 'skia_os == "chromeos"', {
- 'dependencies': [
- 'libpng.gyp:libpng',
- ],
- }],
[ 'skia_os == "ios"', {
'include_dirs': [
'../include/utils/mac',
diff --git a/gyp/libjpeg-turbo.gyp b/gyp/libjpeg-turbo.gyp
index 407fcca..801b21e 100644
--- a/gyp/libjpeg-turbo.gyp
+++ b/gyp/libjpeg-turbo.gyp
@@ -293,7 +293,7 @@
},
}],
[ '(skia_os == "linux" or skia_os == "freebsd" or skia_os == "openbsd" or \
- skia_os == "solaris" or skia_os == "chromeos")', {
+ skia_os == "solaris")', {
'dependencies': [
'yasm.gyp:yasm#host',
],
diff --git a/gyp/pdf.gyp b/gyp/pdf.gyp
index a640833..bc240b1 100644
--- a/gyp/pdf.gyp
+++ b/gyp/pdf.gyp
@@ -39,7 +39,7 @@
],
'conditions': [
[ 'skia_pdf_use_sfntly and not skia_android_framework and \
- skia_os in ["win", "android", "linux", "chromeos", "mac"]',
+ skia_os in ["win", "android", "linux", "mac"]',
{ 'dependencies': [ 'sfntly.gyp:sfntly' ] }
],
[ 'skia_pdf_less_compression',
diff --git a/gyp/ports.gyp b/gyp/ports.gyp
index 25db385..fa3db46 100644
--- a/gyp/ports.gyp
+++ b/gyp/ports.gyp
@@ -74,7 +74,7 @@
['exclude', 'SkFontMgr_.+_factory\\.cpp$'],
],
'conditions': [
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos", "android"]', {
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android"]', {
'sources': [
'../src/ports/SkFontHost_FreeType.cpp',
'../src/ports/SkFontHost_FreeType_common.cpp',
diff --git a/gyp/sfntly.gyp b/gyp/sfntly.gyp
index 4e3ca5f..b23a7db 100644
--- a/gyp/sfntly.gyp
+++ b/gyp/sfntly.gyp
@@ -44,7 +44,7 @@
},
}
],
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]',
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]',
{ 'link_settings': { 'libraries': [ '-lpthread', ], }, },
],
],
diff --git a/gyp/tests.gypi b/gyp/tests.gypi
index dfce3c0..f8e4095 100644
--- a/gyp/tests.gypi
+++ b/gyp/tests.gypi
@@ -29,7 +29,7 @@
'zlib.gyp:zlib',
],
'conditions': [
- [ 'skia_os not in ["linux", "freebsd", "openbsd", "solaris", "chromeos", "android"]', {
+ [ 'skia_os not in ["linux", "freebsd", "openbsd", "solaris", "android"]', {
'sources!': [ '../tests/FontMgrAndroidParserTest.cpp', ],
}],
[ 'not skia_pdf', {
diff --git a/gyp/utils.gyp b/gyp/utils.gyp
index 2384307..4cd71a7 100644
--- a/gyp/utils.gyp
+++ b/gyp/utils.gyp
@@ -59,8 +59,8 @@
'../src/utils/mac/SkCreateCGImageRef.cpp',
],
}],
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
- },{ #else if 'skia_os not in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]'
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
+ },{ #else if 'skia_os not in ["linux", "freebsd", "openbsd", "solaris"]'
'include_dirs!': [
'../include/utils/unix',
],
diff --git a/gyp/views.gyp b/gyp/views.gyp
index 7b5eb78..4ba6174 100644
--- a/gyp/views.gyp
+++ b/gyp/views.gyp
@@ -98,7 +98,7 @@
'../src/views/mac/skia_mac.mm',
],
}],
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"] and skia_use_sdl == 0', {
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"] and skia_use_sdl == 0', {
'link_settings': {
'libraries': [
'-lGL',
diff --git a/platform_tools/chromeos/bin/build_skia_in_chroot b/platform_tools/chromeos/bin/build_skia_in_chroot
deleted file mode 100755
index 86f6d33..0000000
--- a/platform_tools/chromeos/bin/build_skia_in_chroot
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-# This script builds Skia inside of a ChromeOS chroot. It is intended to be run
-# either while inside the chroot or indirectly by running chromeos_make which
-# enters the chroot and runs this script.
-
-makeVars=""
-deviceID=""
-
-while (( "$#" )); do
-
- if [[ $(echo "$1" | grep "^-d$") != "" ]];
- then
- deviceID="$2"
- shift
- else
- makeVars="$makeVars $1"
- fi
-
-shift
-done
-
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source $SCRIPT_DIR/chromeos_setup.sh
-
-setup_device $deviceID
-returnVal=$?
-if [ $returnVal != 0 ]
-then
- exit 1;
-fi
-
-python gyp_skia
-make ${makeVars}
-returnVal=$?
-if [ $returnVal != 0 ]
-then
- exit 1;
-fi
-
-echo > .cros_build_successful
\ No newline at end of file
diff --git a/platform_tools/chromeos/bin/chromeos_make b/platform_tools/chromeos/bin/chromeos_make
deleted file mode 100755
index cb58a9c..0000000
--- a/platform_tools/chromeos/bin/chromeos_make
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-
-# This script builds Skia for ChromeOS by mounting the Skia checkout inside a
-# chroot contained within an existing ChromeOS checkout, entering the chroot,
-# and running the build_skia_in_chroot script.
-
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-if [ $(uname) != "Linux" ]; then
- echo "ERROR: Can only build for ChromeOS on Linux."
- exit 1
-fi
-
-
-makeVars=""
-deviceID=""
-
-while (( "$#" )); do
-
- if [[ $(echo "$1" | grep "^-d$") != "" ]];
- then
- deviceID="$2"
- shift
- else
- makeVars="$makeVars $1"
- fi
-
-shift
-done
-
-if [[ -z "${deviceID}" ]]; then
- echo "You must provide a deviceID with -d."
- exit 1
-fi
-
-CHROMEOS_CHROOT="${SCRIPT_DIR}/../toolchain"
-
-# Get the required SDK version.
-# TODO(borenet): Should we instead get the latest from GS?
-#SDK_VERSION=$(gsutil cat gs://chromeos-image-archive/${deviceID}-release/LATEST-master)
-#SDK_VERSION=${SDK_VERSION:4}
-SDK_VERSION="4279.0.0"
-mkdir -p "${CHROMEOS_CHROOT}/src/chromeos"
-echo -n ${SDK_VERSION} > "${CHROMEOS_CHROOT}/src/chromeos/CHROMEOS_LKGM"
-
-# Download the toolchain tarball if needed.
-# TODO(borenet): Let chrome-sdk take care of this once it works with external
-# boards.
-if ! [[ -d "${CHROMEOS_CHROOT}/.cros_cache" ]]; then
- TARBALL="cros_toolchain.tgz"
- gsutil cp gs://chromium-skia-gm/chromeos-toolchains/${TARBALL} ${CHROMEOS_CHROOT}
- if [ "$?" != "0" ]
- then
- exit 1;
- fi
- pushd "${CHROMEOS_CHROOT}" > /dev/null
- tar -zxvf ${TARBALL}
- popd > /dev/null
- rm ${CHROMEOS_CHROOT}/${TARBALL}
-fi
-
-# Put a fake .gclient file in the toolchain directory so that the cros tool
-# thinks we're in a Chrome checkout.
-echo "Delete me!" > "${CHROMEOS_CHROOT}/.gclient"
-
-# We may also need a .git directory.
-GIT_DIR="${CHROMEOS_CHROOT}/src/third_party/chromite/.git"
-if ! [[ -d "${GIT_DIR}" ]]; then
- mkdir -p ${GIT_DIR}
-fi
-
-# Where the Skia code will pretend to live inside the chroot.
-SKIA_TOP_DIR="${SCRIPT_DIR}/../../.."
-
-pushd ${CHROMEOS_CHROOT}
-cros chrome-sdk --nogoma --board ${deviceID} --debug -- /bin/sh -c "cd ${SKIA_TOP_DIR}; platform_tools/chromeos/bin/build_skia_in_chroot ${makeVars}"
-popd > /dev/null
-
-# Clean up
-rm ${CHROMEOS_CHROOT}/.gclient
-
-if [ -f .cros_build_successful ]; then
- rm -rf .cros_build_successful
- exit 0
-fi
-
-exit 1
\ No newline at end of file
diff --git a/platform_tools/chromeos/bin/chromeos_setup.sh b/platform_tools/chromeos/bin/chromeos_setup.sh
deleted file mode 100755
index 41267ec..0000000
--- a/platform_tools/chromeos/bin/chromeos_setup.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-# Set up the environment to build Skia for ChromeOS.
-###############################################################################
-# Copyright 2015 Google Inc.
-#
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-###############################################################################
-
-function exportVar {
- NAME=$1
- VALUE=$2
- echo export $NAME=\"$VALUE\"
- export $NAME="$VALUE"
-}
-
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-# Helper function to configure the GYP defines to the appropriate values
-# based on the target device.
-setup_device() {
- # Setup the build variation depending on the target device
- TARGET_DEVICE="${SDK_BOARD}"
-
- if [ -z "$TARGET_DEVICE" ]; then
- echo "ERROR: No target device specified!"
- return 1
- fi
-
- DEFINES="OS=linux host_os=linux skia_os=chromeos skia_gpu=0"
-
- case $TARGET_DEVICE in
- link)
- DEFINES="${DEFINES} skia_arch_type=x86_64"
- GENERIC_BOARD_TYPE="amd64-generic"
- ;;
- daisy)
- DEFINES="${DEFINES} skia_arch_type=arm arm_version=7 arm_neon=1"
- # TODO(borenet): We have to define skia_warnings_as_errors=0 for the arm
- # build, which throws lots of "mangling of va_list has changed" warnings.
- DEFINES="${DEFINES} skia_warnings_as_errors=0"
- GENERIC_BOARD_TYPE="arm-generic"
- ;;
- *)
- echo -n "ERROR: unknown device specified ($TARGET_DEVICE), valid values: "
- echo "x86-alex link daisy"
- return 1;
- ;;
- esac
-
- echo "The build is targeting the device: $TARGET_DEVICE"
-
- exportVar GENERIC_BOARD_TYPE ${GENERIC_BOARD_TYPE}
- exportVar GYP_DEFINES "$DEFINES"
- exportVar GYP_GENERATORS "ninja"
- exportVar GYP_GENERATOR_FLAGS ""
- SKIA_OUT=${SKIA_OUT:-out}
- exportVar SKIA_OUT "${SKIA_OUT}/config/chromeos-${TARGET_DEVICE}"
- exportVar builddir_name "."
-}
diff --git a/tools/buildbot_spec.json b/tools/buildbot_spec.json
index fe2742c..9a16f22 100644
--- a/tools/buildbot_spec.json
+++ b/tools/buildbot_spec.json
@@ -108,10 +108,6 @@
"serialize-8888",
"gm",
"_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
"drawfilter",
"serialize-8888",
"gm",
@@ -328,10 +324,6 @@
"serialize-8888",
"gm",
"_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
"drawfilter",
"serialize-8888",
"gm",
@@ -546,10 +538,6 @@
"serialize-8888",
"gm",
"_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
"drawfilter",
"serialize-8888",
"gm",
@@ -687,440 +675,6 @@
"upload_dm_results": true,
"upload_perf_results": false
},
- "Build-Ubuntu-GCC-Arm7-Debug-CrOS_Daisy": {
- "build_targets": [
- "most"
- ],
- "builder_cfg": {
- "compiler": "GCC",
- "configuration": "Debug",
- "extra_config": "CrOS_Daisy",
- "is_trybot": false,
- "os": "Ubuntu",
- "role": "Build",
- "target_arch": "Arm7"
- },
- "configuration": "Debug",
- "device_cfg": "daisy",
- "dm_flags": [
- "--config",
- "565",
- "8888",
- "gpu",
- "gpusrgb",
- "msaa16",
- "serialize-8888",
- "tiles_rt-8888",
- "pic-8888",
- "--src",
- "tests",
- "gm",
- "image",
- "--blacklist",
- "f16",
- "_",
- "_",
- "dstreadshuffle",
- "f16",
- "image",
- "_",
- "_",
- "srgb",
- "image",
- "_",
- "_",
- "gpusrgb",
- "image",
- "_",
- "_",
- "serialize-8888",
- "gm",
- "_",
- "not_native32_bitmap_config",
- "serialize-8888",
- "gm",
- "_",
- "bleed_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
- "c_gms",
- "serialize-8888",
- "gm",
- "_",
- "colortype",
- "serialize-8888",
- "gm",
- "_",
- "colortype_xfermodes",
- "serialize-8888",
- "gm",
- "_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
- "drawfilter",
- "serialize-8888",
- "gm",
- "_",
- "fontmgr_bounds_0.75_0",
- "serialize-8888",
- "gm",
- "_",
- "fontmgr_bounds_1_-0.25",
- "serialize-8888",
- "gm",
- "_",
- "fontmgr_bounds",
- "serialize-8888",
- "gm",
- "_",
- "fontmgr_match",
- "serialize-8888",
- "gm",
- "_",
- "fontmgr_iter",
- "serialize-8888",
- "gm",
- "_",
- "verylargebitmap",
- "serialize-8888",
- "gm",
- "_",
- "verylarge_picture_image",
- "sp-8888",
- "gm",
- "_",
- "drawfilter",
- "pic-8888",
- "gm",
- "_",
- "drawfilter",
- "2ndpic-8888",
- "gm",
- "_",
- "drawfilter",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
- "pic-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
- "serialize-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
- "pic-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
- "serialize-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
- "pic-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
- "serialize-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable"
- ],
- "do_perf_steps": false,
- "do_test_steps": false,
- "env": {
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=1"
- },
- "nanobench_flags": [
- "--pre_log",
- "--scales",
- "1.0",
- "1.1",
- "--config",
- "565",
- "8888",
- "gpu",
- "nonrendering",
- "angle",
- "hwui",
- "msaa16",
- "nvpr16",
- "nvprdit16",
- "--match",
- "~inc0.gif",
- "~inc1.gif",
- "~incInterlaced.gif",
- "~inc0.jpg",
- "~incGray.jpg",
- "~inc0.wbmp",
- "~inc1.wbmp",
- "~inc0.webp",
- "~inc1.webp",
- "~inc0.ico",
- "~inc1.ico",
- "~inc0.png",
- "~inc1.png",
- "~inc2.png",
- "~inc12.png",
- "~inc13.png",
- "~inc14.png",
- "~inc0.webp",
- "~inc1.webp"
- ],
- "upload_dm_results": true,
- "upload_perf_results": false
- },
- "Build-Ubuntu-GCC-x86_64-Debug-CrOS_Link": {
- "build_targets": [
- "most"
- ],
- "builder_cfg": {
- "compiler": "GCC",
- "configuration": "Debug",
- "extra_config": "CrOS_Link",
- "is_trybot": false,
- "os": "Ubuntu",
- "role": "Build",
- "target_arch": "x86_64"
- },
- "configuration": "Debug",
- "device_cfg": "link",
- "dm_flags": [
- "--config",
- "565",
- "8888",
- "gpu",
- "gpusrgb",
- "pdf",
- "msaa16",
- "serialize-8888",
- "tiles_rt-8888",
- "pic-8888",
- "--src",
- "tests",
- "gm",
- "image",
- "--blacklist",
- "f16",
- "_",
- "_",
- "dstreadshuffle",
- "f16",
- "image",
- "_",
- "_",
- "srgb",
- "image",
- "_",
- "_",
- "gpusrgb",
- "image",
- "_",
- "_",
- "serialize-8888",
- "gm",
- "_",
- "not_native32_bitmap_config",
- "serialize-8888",
- "gm",
- "_",
- "bleed_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
- "c_gms",
- "serialize-8888",
- "gm",
- "_",
- "colortype",
- "serialize-8888",
- "gm",
- "_",
- "colortype_xfermodes",
- "serialize-8888",
- "gm",
- "_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
- "drawfilter",
- "serialize-8888",
- "gm",
- "_",
- "fontmgr_bounds_0.75_0",
- "serialize-8888",
- "gm",
- "_",
- "fontmgr_bounds_1_-0.25",
- "serialize-8888",
- "gm",
- "_",
- "fontmgr_bounds",
- "serialize-8888",
- "gm",
- "_",
- "fontmgr_match",
- "serialize-8888",
- "gm",
- "_",
- "fontmgr_iter",
- "serialize-8888",
- "gm",
- "_",
- "verylargebitmap",
- "serialize-8888",
- "gm",
- "_",
- "verylarge_picture_image",
- "sp-8888",
- "gm",
- "_",
- "drawfilter",
- "pic-8888",
- "gm",
- "_",
- "drawfilter",
- "2ndpic-8888",
- "gm",
- "_",
- "drawfilter",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
- "pic-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
- "serialize-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
- "pic-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
- "serialize-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
- "pic-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
- "serialize-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable"
- ],
- "do_perf_steps": false,
- "do_test_steps": false,
- "env": {
- "GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1"
- },
- "nanobench_flags": [
- "--pre_log",
- "--scales",
- "1.0",
- "1.1",
- "--config",
- "565",
- "8888",
- "gpu",
- "nonrendering",
- "angle",
- "hwui",
- "msaa16",
- "nvpr16",
- "nvprdit16",
- "--match",
- "~interlaced1.png",
- "~interlaced2.png",
- "~interlaced3.png",
- "~inc0.gif",
- "~inc1.gif",
- "~incInterlaced.gif",
- "~inc0.jpg",
- "~incGray.jpg",
- "~inc0.wbmp",
- "~inc1.wbmp",
- "~inc0.webp",
- "~inc1.webp",
- "~inc0.ico",
- "~inc1.ico",
- "~inc0.png",
- "~inc1.png",
- "~inc2.png",
- "~inc12.png",
- "~inc13.png",
- "~inc14.png",
- "~inc0.webp",
- "~inc1.webp"
- ],
- "upload_dm_results": true,
- "upload_perf_results": false
- },
"Build-Ubuntu-GCC-x86_64-Release-ANGLE": {
"build_targets": [
"most"
@@ -1199,10 +753,6 @@
"serialize-8888",
"gm",
"_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
"drawfilter",
"serialize-8888",
"gm",
@@ -1417,10 +967,6 @@
"serialize-8888",
"gm",
"_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
"drawfilter",
"serialize-8888",
"gm",
@@ -1680,10 +1226,6 @@
"serialize-8888",
"gm",
"_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
"drawfilter",
"serialize-8888",
"gm",
@@ -1944,10 +1486,6 @@
"serialize-8888",
"gm",
"_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
"drawfilter",
"serialize-8888",
"gm",
@@ -2208,10 +1746,6 @@
"serialize-8888",
"gm",
"_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
"drawfilter",
"serialize-8888",
"gm",
@@ -2422,10 +1956,6 @@
"serialize-8888",
"gm",
"_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
"drawfilter",
"serialize-8888",
"gm",
@@ -2640,10 +2170,6 @@
"serialize-8888",
"gm",
"_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
"drawfilter",
"serialize-8888",
"gm",
@@ -2949,10 +2475,6 @@
"serialize-8888",
"gm",
"_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
"drawfilter",
"serialize-8888",
"gm",
@@ -3308,10 +2830,6 @@
"serialize-8888",
"gm",
"_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
"drawfilter",
"serialize-8888",
"gm",
@@ -3624,10 +3142,6 @@
"serialize-8888",
"gm",
"_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
"drawfilter",
"serialize-8888",
"gm",
@@ -3946,10 +3460,6 @@
"serialize-8888",
"gm",
"_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
"drawfilter",
"serialize-8888",
"gm",
@@ -4185,228 +3695,6 @@
"upload_dm_results": true,
"upload_perf_results": false
},
- "Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug": {
- "build_targets": [
- "dm",
- "nanobench"
- ],
- "builder_cfg": {
- "arch": "x86_64",
- "compiler": "GCC",
- "configuration": "Debug",
- "cpu_or_gpu": "CPU",
- "cpu_or_gpu_value": "AVX",
- "is_trybot": false,
- "model": "Link",
- "os": "ChromeOS",
- "role": "Test"
- },
- "configuration": "Debug",
- "device_cfg": "link",
- "dm_flags": [
- "--config",
- "565",
- "8888",
- "gpu",
- "gpusrgb",
- "pdf",
- "msaa16",
- "serialize-8888",
- "tiles_rt-8888",
- "pic-8888",
- "--src",
- "tests",
- "gm",
- "image",
- "--blacklist",
- "f16",
- "_",
- "_",
- "dstreadshuffle",
- "f16",
- "image",
- "_",
- "_",
- "srgb",
- "image",
- "_",
- "_",
- "gpusrgb",
- "image",
- "_",
- "_",
- "serialize-8888",
- "gm",
- "_",
- "not_native32_bitmap_config",
- "serialize-8888",
- "gm",
- "_",
- "bleed_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
- "c_gms",
- "serialize-8888",
- "gm",
- "_",
- "colortype",
- "serialize-8888",
- "gm",
- "_",
- "colortype_xfermodes",
- "serialize-8888",
- "gm",
- "_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
- "drawfilter",
- "serialize-8888",
- "gm",
- "_",
- "fontmgr_bounds_0.75_0",
- "serialize-8888",
- "gm",
- "_",
- "fontmgr_bounds_1_-0.25",
- "serialize-8888",
- "gm",
- "_",
- "fontmgr_bounds",
- "serialize-8888",
- "gm",
- "_",
- "fontmgr_match",
- "serialize-8888",
- "gm",
- "_",
- "fontmgr_iter",
- "serialize-8888",
- "gm",
- "_",
- "verylargebitmap",
- "serialize-8888",
- "gm",
- "_",
- "verylarge_picture_image",
- "sp-8888",
- "gm",
- "_",
- "drawfilter",
- "pic-8888",
- "gm",
- "_",
- "drawfilter",
- "2ndpic-8888",
- "gm",
- "_",
- "drawfilter",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
- "pic-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
- "serialize-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
- "pic-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
- "serialize-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
- "pic-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
- "serialize-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable"
- ],
- "do_perf_steps": true,
- "do_test_steps": true,
- "env": {
- "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0"
- },
- "nanobench_flags": [
- "--pre_log",
- "--scales",
- "1.0",
- "1.1",
- "--config",
- "565",
- "8888",
- "gpu",
- "nonrendering",
- "angle",
- "hwui",
- "msaa16",
- "nvpr16",
- "nvprdit16",
- "--match",
- "~interlaced1.png",
- "~interlaced2.png",
- "~interlaced3.png",
- "~inc0.gif",
- "~inc1.gif",
- "~incInterlaced.gif",
- "~inc0.jpg",
- "~incGray.jpg",
- "~inc0.wbmp",
- "~inc1.wbmp",
- "~inc0.webp",
- "~inc1.webp",
- "~inc0.ico",
- "~inc1.ico",
- "~inc0.png",
- "~inc1.png",
- "~inc2.png",
- "~inc12.png",
- "~inc13.png",
- "~inc14.png",
- "~inc0.webp",
- "~inc1.webp"
- ],
- "upload_dm_results": true,
- "upload_perf_results": false
- },
"Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer": {
"build_targets": [
"dm",
@@ -4427,7 +3715,7 @@
"configuration": "Debug",
"dm_flags": [
"--config",
- "command_buffer",
+ "commandbuffer",
"--src",
"tests",
"gm",
@@ -4512,10 +3800,6 @@
"serialize-8888",
"gm",
"_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
"drawfilter",
"serialize-8888",
"gm",
@@ -4861,10 +4145,6 @@
"serialize-8888",
"gm",
"_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
"drawfilter",
"serialize-8888",
"gm",
@@ -5186,10 +4466,6 @@
"serialize-8888",
"gm",
"_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
"drawfilter",
"serialize-8888",
"gm",
@@ -5280,6 +4556,7 @@
"_",
"image-cacherator-from-ctable"
],
+ "do_compile_steps": false,
"do_perf_steps": false,
"do_test_steps": true,
"env": {
@@ -5413,10 +4690,6 @@
"serialize-8888",
"gm",
"_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
"drawfilter",
"serialize-8888",
"gm",
@@ -5638,10 +4911,6 @@
"serialize-8888",
"gm",
"_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
"drawfilter",
"serialize-8888",
"gm",
@@ -5864,10 +5133,6 @@
"serialize-8888",
"gm",
"_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
"drawfilter",
"serialize-8888",
"gm",
@@ -6090,10 +5355,6 @@
"serialize-8888",
"gm",
"_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
"drawfilter",
"serialize-8888",
"gm",
@@ -6333,10 +5594,6 @@
"serialize-8888",
"gm",
"_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
"drawfilter",
"serialize-8888",
"gm",
@@ -6693,10 +5950,6 @@
"serialize-8888",
"gm",
"_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
"drawfilter",
"serialize-8888",
"gm",
@@ -7052,10 +6305,6 @@
"serialize-8888",
"gm",
"_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
"drawfilter",
"serialize-8888",
"gm",
@@ -7320,10 +6569,6 @@
"serialize-8888",
"gm",
"_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
"drawfilter",
"serialize-8888",
"gm",
@@ -7679,10 +6924,6 @@
"serialize-8888",
"gm",
"_",
- "colorwheelnative",
- "serialize-8888",
- "gm",
- "_",
"drawfilter",
"serialize-8888",
"gm",
diff --git a/tools/buildbot_spec.py b/tools/buildbot_spec.py
index 28a01c3..ae3d4ef 100755
--- a/tools/buildbot_spec.py
+++ b/tools/buildbot_spec.py
@@ -241,18 +241,6 @@
'NexusPlayer': 'x86',
}[builder_dict['model']]
- # ChromeOS.
- if 'CrOS' in builder_dict.get('extra_config', ''):
- if 'Link' in builder_dict['extra_config']:
- return 'link'
- if 'Daisy' in builder_dict['extra_config']:
- return 'daisy'
- elif builder_dict.get('os') == 'ChromeOS':
- return {
- 'Link': 'link',
- 'Daisy': 'daisy',
- }[builder_dict['model']]
-
# iOS.
if 'iOS' in builder_dict.get('os', ''):
return {
@@ -364,8 +352,6 @@
'Build-Win-MSVC-x86-Debug-Exceptions',
'Build-Ubuntu-GCC-Arm7-Debug-Android_FrameworkDefs',
'Build-Ubuntu-GCC-Arm7-Debug-Android_NoNeon',
- 'Build-Ubuntu-GCC-Arm7-Debug-CrOS_Daisy',
- 'Build-Ubuntu-GCC-x86_64-Debug-CrOS_Link',
'Build-Ubuntu-GCC-x86_64-Release-Mesa',
'Build-Ubuntu-GCC-x86_64-Release-ANGLE',
'Housekeeper-PerCommit',
@@ -374,7 +360,6 @@
'Test-Android-GCC-GalaxyS4-GPU-SGX544-Arm7-Debug',
'Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release-Appurify',
'Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug',
- 'Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug',
'Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug',
'Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer',
'Test-Mac10.8-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release',