Skip to content

A
angle
Commit 4953f03d by Tim Van Patten Committed by Commit Bot
Options

Revert "Link C++ histogram support into angle_perftests."

This reverts commit 7a026354. Reason for revert: Breaks roll of ANGLE into AOSP: ERROR at //testing/test.gni:76:5: Assertion failed. assert(_use_raw_android_executable || enable_java_templates) ^----- See //third_party/catapult/tracing/tracing/BUILD.gn:35:1: whence it was called. test("histogram_unittests") { ^---------------------------- See //src/tests/BUILD.gn:262:17: which caused the file to be included. deps += [ "//third_party/catapult/tracing/tracing:histogram" ] ^------------------------------------------------- Original change's description: > Link C++ histogram support into angle_perftests. > > This is the first step in uploading histogram data instead of a gtest > special format. We importing several new libraries: > > - tools/protoc_wrapper > - third_party/protobuf > - third_party/catapult (was already used for Android) > > No functional change. Only affects compilation. Protobuf support is > disabled when not available. > > Bug: angleproject:5161 > Change-Id: Ie28d57d7e142c437ebd51463ce3e2cafd87468d1 > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2482294 > Reviewed-by: Yuly Novikov <ynovikov@chromium.org> > Reviewed-by: Brian Sheedy <bsheedy@chromium.org> > Commit-Queue: Jamie Madill <jmadill@chromium.org> TBR=ynovikov@chromium.org,bsheedy@chromium.org,jmadill@chromium.org Change-Id: I62c4b926cbe82d10e460b28b5f864521e2b1f8ee No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: angleproject:5161 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2495549Reviewed-by: 's avatarTim Van Patten <timvp@google.com> Commit-Queue: Tim Van Patten <timvp@google.com>
parent cbcb2f23
Showing with 1 addition and 27 deletions
.gitignore
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
/third_party/libpng/src /third_party/libpng/src
/third_party/llvm-build /third_party/llvm-build
/third_party/nasm /third_party/nasm
/third_party/protobuf
/third_party/Python-Markdown /third_party/Python-Markdown
/third_party/qemu-linux-x64 /third_party/qemu-linux-x64
/third_party/qemu-mac-x64 /third_party/qemu-mac-x64
...@@ -72,7 +71,6 @@ ...@@ -72,7 +71,6 @@
/tools/mb /tools/mb
/tools/md_browser /tools/md_browser
/tools/memory /tools/memory
/tools/protoc_wrapper
/tools/skia_goldctl /tools/skia_goldctl
angle_debug.txt angle_debug.txt
build build
......
.gn
...@@ -36,7 +36,4 @@ default_args = { ...@@ -36,7 +36,4 @@ default_args = {
clang_use_chrome_plugins = true clang_use_chrome_plugins = true
build_angle_deqp_tests = true build_angle_deqp_tests = true
use_sysroot = true use_sysroot = true
# Saves on importing extra dependencies and ANGLE doesn't use JS.
enable_js_protobuf = false
} }
DEPS
...@@ -134,7 +134,7 @@ deps = { ...@@ -134,7 +134,7 @@ deps = {
'third_party/catapult': { 'third_party/catapult': {
'url': '{chromium_git}/catapult.git@{catapult_revision}', 'url': '{chromium_git}/catapult.git@{catapult_revision}',
'condition': 'not build_with_chromium', 'condition': 'checkout_android and not build_with_chromium',
}, },
# Cherry is a dEQP/VK-GL-CTS management GUI written in Go. We use it for viewing test results. # Cherry is a dEQP/VK-GL-CTS management GUI written in Go. We use it for viewing test results.
...@@ -197,11 +197,6 @@ deps = { ...@@ -197,11 +197,6 @@ deps = {
'condition': 'not build_with_chromium', 'condition': 'not build_with_chromium',
}, },
'third_party/protobuf': {
'url': '{chromium_git}/chromium/src/third_party/protobuf@d044036fd85e658918bf9fb58bc0f083945f952f',
'condition': 'not build_with_chromium',
},
'third_party/Python-Markdown': { 'third_party/Python-Markdown': {
'url': '{chromium_git}/chromium/src/third_party/Python-Markdown@ad4fc19d612de0a3f6ea19441af703ff5a5223f3', 'url': '{chromium_git}/chromium/src/third_party/Python-Markdown@ad4fc19d612de0a3f6ea19441af703ff5a5223f3',
'condition': 'not build_with_chromium', 'condition': 'not build_with_chromium',
...@@ -333,11 +328,6 @@ deps = { ...@@ -333,11 +328,6 @@ deps = {
'condition': 'not build_with_chromium', 'condition': 'not build_with_chromium',
}, },
'tools/protoc_wrapper': {
'url': '{chromium_git}/chromium/src/tools/protoc_wrapper@203790d7975787dd77c3d870dadb9e4fdc9c907b',
'condition': 'not build_with_chromium',
},
'tools/skia_goldctl/linux': { 'tools/skia_goldctl/linux': {
'packages': [ 'packages': [
{ {
......
scripts/roll_chromium_deps.py
...@@ -35,10 +35,8 @@ ANGLE_CHROMIUM_DEPS = [ ...@@ -35,10 +35,8 @@ ANGLE_CHROMIUM_DEPS = [
'buildtools', 'buildtools',
'testing', 'testing',
'third_party/abseil-cpp', 'third_party/abseil-cpp',
'third_party/catapult',
'third_party/libjpeg_turbo', 'third_party/libjpeg_turbo',
'third_party/nasm', 'third_party/nasm',
'third_party/protobuf',
'third_party/Python-Markdown', 'third_party/Python-Markdown',
'third_party/qemu-linux-x64', 'third_party/qemu-linux-x64',
'third_party/qemu-mac-x64', 'third_party/qemu-mac-x64',
...@@ -49,7 +47,6 @@ ANGLE_CHROMIUM_DEPS = [ ...@@ -49,7 +47,6 @@ ANGLE_CHROMIUM_DEPS = [
'tools/mb', 'tools/mb',
'tools/md_browser', 'tools/md_browser',
'tools/memory', 'tools/memory',
'tools/protoc_wrapper',
'tools/skia_goldctl/linux', 'tools/skia_goldctl/linux',
'tools/skia_goldctl/mac', 'tools/skia_goldctl/mac',
'tools/skia_goldctl/win', 'tools/skia_goldctl/win',
......
src/tests/BUILD.gn
...@@ -16,10 +16,6 @@ declare_args() { ...@@ -16,10 +16,6 @@ declare_args() {
is_win || is_linux || is_chromeos || is_android || is_mac || is_fuchsia is_win || is_linux || is_chromeos || is_android || is_mac || is_fuchsia
} }
declare_args() {
angle_has_histograms = build_angle_perftests && angle_has_build
}
angle_test("test_utils_unittest_helper") { angle_test("test_utils_unittest_helper") {
sources = [ sources = [
"../../util/test_utils_unittest_helper.cpp", "../../util/test_utils_unittest_helper.cpp",
...@@ -257,10 +253,6 @@ template("angle_perftests_common") { ...@@ -257,10 +253,6 @@ template("angle_perftests_common") {
deps = [ "$angle_jsoncpp_dir:jsoncpp" ] deps = [ "$angle_jsoncpp_dir:jsoncpp" ]
public_deps = [ "${invoker.test_utils}" ] public_deps = [ "${invoker.test_utils}" ]
public_configs += [ "${angle_root}:libANGLE_config" ] public_configs += [ "${angle_root}:libANGLE_config" ]
if (angle_has_histograms) {
deps += [ "//third_party/catapult/tracing/tracing:histogram" ]
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment