Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1164)

Unified Diff: third_party/WebKit/Source/platform/wtf/BUILD.gn

Issue 2774333002: Revert "Move files in wtf/ to platform/wtf/" (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/wtf/BUILD.gn
diff --git a/third_party/WebKit/Source/platform/wtf/BUILD.gn b/third_party/WebKit/Source/platform/wtf/BUILD.gn
index 57617d3199651e2a9ac5c83c4d510e60340e31d7..a4f691b81d015537ad1ca3dfcf4154da22f1f573 100644
--- a/third_party/WebKit/Source/platform/wtf/BUILD.gn
+++ b/third_party/WebKit/Source/platform/wtf/BUILD.gn
@@ -20,16 +20,14 @@
#
# When we finish moving all the files, "platform_wtf" target will take over
# the role of "wtf".
+#
+# TODO(yutak): Set up platform_wtf_unittests in the similar manner.
assert(!is_ios)
-import("//testing/test.gni")
import("//third_party/WebKit/Source/config.gni")
-visibility = [
- ":*",
- "//third_party/WebKit/Source/wtf/*",
-]
+visibility = [ "//third_party/WebKit/Source/wtf/*" ]
config("wtf_config") {
if (is_win) {
@@ -59,7 +57,7 @@ config("wtf_config") {
}
}
-component("platform_wtf") {
+source_set("platform_wtf") {
sources = [
"ASCIICType.cpp",
"ASCIICType.h",
@@ -73,8 +71,6 @@ component("platform_wtf") {
"BitVector.cpp",
"BitVector.h",
"BitwiseOperations.h",
- "BloomFilter.h",
- "ByteOrder.h",
"ByteSwap.h",
"CPU.h",
"CheckedNumeric.h",
@@ -87,13 +83,10 @@ component("platform_wtf") {
"CurrentTime.h",
"DataLog.cpp",
"DataLog.h",
- "DateMath.cpp",
- "DateMath.h",
"Deque.h",
"DoublyLinkedList.h",
"DynamicAnnotations.cpp",
"DynamicAnnotations.h",
- "FilePrintStream.cpp",
"FilePrintStream.h",
"Forward.h",
"Functional.h",
@@ -108,7 +101,6 @@ component("platform_wtf") {
"HashTableDeletedValueType.h",
"HashTraits.h",
"HexNumber.h",
- "InstanceCounter.cpp",
"InstanceCounter.h",
"LeakAnnotations.h",
"LinkedHashSet.h",
@@ -120,43 +112,31 @@ component("platform_wtf") {
"NotFound.h",
"Optional.h",
"PassRefPtr.h",
- "PrintStream.cpp",
"PrintStream.h",
"PtrUtil.h",
"RefCounted.h",
"RefPtr.h",
- "RefVector.h",
"RetainPtr.h",
- "SaturatedArithmetic.h",
"SizeAssertions.h",
- "SizeLimits.cpp",
"SpinLock.h",
- "StackUtil.cpp",
"StackUtil.h",
"StaticConstructors.h",
"StdLibExtras.h",
"StringExtras.h",
"StringHasher.h",
- "TerminatedArray.h",
- "TerminatedArrayBuilder.h",
"ThreadRestrictionVerifier.h",
"ThreadSafeRefCounted.h",
"ThreadSpecific.h",
- "ThreadSpecificWin.cpp",
"Threading.h",
"ThreadingPrimitives.h",
- "ThreadingPthreads.cpp",
- "ThreadingWin.cpp",
"Time.h",
"TreeNode.h",
"TriState.h",
"TypeTraits.h",
"Vector.h",
"VectorTraits.h",
- "WTF.cpp",
"WTF.h",
"WTFExport.h",
- "WTFThreadData.cpp",
"WTFThreadData.h",
"WeakPtr.h",
"allocator/PartitionAllocator.cpp",
@@ -164,8 +144,6 @@ component("platform_wtf") {
"allocator/Partitions.cpp",
"allocator/Partitions.h",
"build_config.h",
- "debug/Alias.h",
- "debug/CrashLogging.h",
"dtoa.cpp",
"dtoa.h",
"dtoa/bignum-dtoa.cc",
@@ -297,15 +275,15 @@ component("platform_wtf") {
# those files are actually moved to here.
if (is_win) {
- sources -= [ "ThreadingPthreads.cpp" ]
+ # sources -= [ "ThreadingPthreads.cpp" ]
cflags = [ "/wd4068" ] # Unknown pragma.
} else {
# Non-Windows.
- sources -= [
- "ThreadSpecificWin.cpp",
- "ThreadingWin.cpp",
- ]
+ # sources -= [
+ # "ThreadSpecificWin.cpp",
+ # "ThreadingWin.cpp",
+ # ]
}
if (is_android) {
@@ -332,68 +310,3 @@ component("platform_wtf") {
configs += [ "//build/config/compiler:no_symbols" ]
}
}
-
-test("wtf_unittests") {
- visibility = [] # Allow re-assignment of list.
- visibility = [ "*" ]
-
- sources = [
- "ASCIICTypeTest.cpp",
- "AssertionsTest.cpp",
- "DequeTest.cpp",
- "FunctionalTest.cpp",
- "HashMapTest.cpp",
- "HashSetTest.cpp",
- "ListHashSetTest.cpp",
- "MathExtrasTest.cpp",
- "OptionalTest.cpp",
- "PassRefPtrTest.cpp",
- "RefPtrTest.cpp",
- "StringExtrasTest.cpp",
- "StringHasherTest.cpp",
- "TimeTest.cpp",
- "TreeNodeTest.cpp",
- "TypeTraitsTest.cpp",
- "VectorTest.cpp",
- "dtoa_test.cpp",
- "testing/RunAllTests.cpp",
- "text/AtomicStringTest.cpp",
- "text/CStringTest.cpp",
- "text/IntegerToStringConversionTest.cpp",
- "text/StringBufferTest.cpp",
- "text/StringBuilderTest.cpp",
- "text/StringImplTest.cpp",
- "text/StringOperatorsTest.cpp",
- "text/StringToNumberTest.cpp",
- "text/StringViewTest.cpp",
- "text/TextCodecICUTest.cpp",
- "text/TextCodecLatin1Test.cpp",
- "text/TextCodecReplacementTest.cpp",
- "text/TextCodecTest.cpp",
- "text/TextCodecUTF8Test.cpp",
- "text/TextCodecUserDefinedTest.cpp",
- "text/TextEncodingTest.cpp",
- "text/WTFStringTest.cpp",
- "typed_arrays/ArrayBufferBuilderTest.cpp",
- ]
-
- # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
- configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
-
- if (is_win) {
- cflags = [ "/wd4068" ] # Unknown pragma.
- }
-
- configs += [
- "//third_party/WebKit/Source:config",
- "//third_party/WebKit/Source:blink_pch",
- ]
-
- deps = [
- ":platform_wtf",
- "//base",
- "//base/test:test_support",
- "//testing/gmock",
- "//testing/gtest",
- ]
-}
« no previous file with comments | « third_party/WebKit/Source/platform/wtf/AssertionsTest.cpp ('k') | third_party/WebKit/Source/platform/wtf/BloomFilter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698