AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "retry absl"

Browse Source 
This reverts commit 1d256d66ec.

Reason for revert: Build-Debian10-Clang-arm64-Debug-Android_ASAN can't find <cxxabi.h>.

Original change's description:
> retry absl
> 
> This time around, cut the absl deps down to just what's
> needed to compile, link, and run AbseilTest.cpp.
> 
> Add basic absl::btree_map test.
> 
> Bug: skia:10165
> Cq-Include-Trybots: skia/skia.primary:Build-Debian10-Clang-arm-Debug-Chromebook_GLES;skia/skia.primary:Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Release-All-TSAN
> Change-Id: I53d632a04cba8dadd484b2c4d0ceefb314676486
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/286070
> Reviewed-by: John Stiles <johnstiles@google.com>
> Commit-Queue: Mike Klein <mtklein@google.com>

TBR=mtklein@google.com,johnstiles@google.com

Change-Id: I2465ed155f7311c6ca35259ea1bf1b610020a66d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:10165
Cq-Include-Trybots: skia/skia.primary:Build-Debian10-Clang-arm-Debug-Chromebook_GLES;skia/skia.primary:Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Release-All-TSAN
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/286477
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
This commit is contained in:
Mike Klein 2020-04-30 16:11:04 +00:00 committed by Skia Commit-Bot
parent 1d256d66ec
commit 5cf6b31fc8
5 changed files with 0 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BUILD.gn
View File

@ -1574,7 +1574,6 @@ if (skia_enable_tools) {
"modules/skparagraph:tests",
"modules/sksg:tests",
"modules/skshaper",
"//third_party/absl",
"//third_party/libpng",
"//third_party/libwebp",
"//third_party/zlib",

1
DEPS
View File

@ -7,7 +7,6 @@ vars = {
deps = {
"buildtools" : "https://chromium.googlesource.com/chromium/buildtools.git@505de88083136eefd056e5ee4ca0f01fe9b33de8",
"common" : "https://skia.googlesource.com/common.git@9737551d7a52c3db3262db5856e6bcd62c462b92",
"third_party/externals/abseil-cpp" : "https://chromium.googlesource.com/external/github.com/abseil/abseil-cpp.git@1a02b7a2054c24f900dab796edb812f9260b51a6",
"third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@957417438089bfc9c263657c5b071dd264d38d50",
# Dawn requires jinja2 and markupsafe for the code generator, and glslang and shaderc for SPIRV compilation.
# When the Dawn revision is updated these should be updated from the Dawn DEPS as well.

1
gn/tests.gni
View File

@ -8,7 +8,6 @@ _tests = get_path_info("../tests", "abspath")
tests_sources = [
"$_tests/AAClipTest.cpp",
"$_tests/AbseilTest.cpp",
"$_tests/AdvancedBlendTest.cpp",
"$_tests/AndroidCodecTest.cpp",
"$_tests/AnimatedImageTest.cpp",

37
tests/AbseilTest.cpp
View File

@ -1,37 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "tests/Test.h"
#ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK
#include <absl/container/btree_map.h>
#include <absl/hash/hash.h>
#include <absl/strings/substitute.h>
DEF_TEST(AbseilTest, reporter) {
// Tests that Abseil can be compiled, linked and run. Can be removed once Abseil is in use
// elsewhere.
const void* nullVoid = nullptr;
const std::string kStringToHash = absl::Substitute("$0 $1 $2 $3", "absl", 0, false, nullVoid);
REPORTER_ASSERT(reporter, kStringToHash == "absl 0 false NULL");
const size_t hashValue = absl::Hash<std::string>{}(kStringToHash);
REPORTER_ASSERT(reporter, hashValue != 0);
absl::btree_map<int, int> m;
m[42] = 47;
m[41] = 46;
int expected_key = 41,
expected_val = 46;
for (auto [k,v] : m) {
REPORTER_ASSERT(reporter, k == expected_key++);
REPORTER_ASSERT(reporter, v == expected_val++);
}
}
#endif // SK_BUILD_FOR_ANDROID_FRAMEWORK

35
third_party/absl/BUILD.gn vendored
View File

@ -1,35 +0,0 @@
# Copyright 2020 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("../third_party.gni")
third_party("absl") {
public_include_dirs = [ "../externals/abseil-cpp" ]
# We have been bitten by blindly adding parts of Abseil in the past,
# so please vet each new source file you add here carefully. If you're
# not sure what you're looking for, please R += mktlein@google.com.
#
# In particular, please do not add absl::Mutex or dynamic_annotations.cc.
sources = [
"../externals/abseil-cpp/absl/base/internal/raw_logging.cc",
"../externals/abseil-cpp/absl/base/internal/throw_delegate.cc",
"../externals/abseil-cpp/absl/hash/internal/city.cc",
"../externals/abseil-cpp/absl/hash/internal/hash.cc",
"../externals/abseil-cpp/absl/numeric/int128.cc",
"../externals/abseil-cpp/absl/strings/ascii.cc",
"../externals/abseil-cpp/absl/strings/charconv.cc",
"../externals/abseil-cpp/absl/strings/escaping.cc",
"../externals/abseil-cpp/absl/strings/internal/charconv_bigint.cc",
"../externals/abseil-cpp/absl/strings/internal/charconv_parse.cc",
"../externals/abseil-cpp/absl/strings/internal/escaping.cc",
"../externals/abseil-cpp/absl/strings/internal/memutil.cc",
"../externals/abseil-cpp/absl/strings/internal/utf8.cc",
"../externals/abseil-cpp/absl/strings/match.cc",
"../externals/abseil-cpp/absl/strings/numbers.cc",
"../externals/abseil-cpp/absl/strings/str_cat.cc",
"../externals/abseil-cpp/absl/strings/substitute.cc",
]
}