Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 7ccc5de

Browse files
authored
Shift some deps to //flutter/third_party (#50830)
Part of flutter/flutter#67373
1 parent 2242060 commit 7ccc5de

File tree

34 files changed

+5240
-5367
lines changed

34 files changed

+5240
-5367
lines changed

DEPS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,8 @@ deps = {
283283
'src/flutter/third_party/rapidjson':
284284
Var('flutter_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b',
285285

286-
'src/third_party/harfbuzz':
287-
Var('flutter_git') + '/third_party/harfbuzz' + '@' + 'b61761f36e93c3f1e36c9bed0755acfa7f4e3d4f',
286+
'src/flutter/third_party/harfbuzz':
287+
Var('flutter_git') + '/third_party/harfbuzz' + '@' + 'ea8f97c615f0ba17dc25013ef67dbd6bfaaa76f2',
288288

289289
'src/third_party/libcxx':
290290
Var('llvm_git') + '/llvm-project/libcxx' + '@' + '44079a4cc04cdeffb9cfe8067bfb3c276fb2bab0',
@@ -313,7 +313,7 @@ deps = {
313313
'src/flutter/third_party/benchmark':
314314
Var('chromium_git') + '/external/github.com/google/benchmark' + '@' + '431abd149fd76a072f821913c0340137cc755f36',
315315

316-
'src/third_party/googletest':
316+
'src/flutter/third_party/googletest':
317317
Var('chromium_git') + '/external/github.com/google/googletest' + '@' + '7f036c5563af7d0329f20e8bb42effb04629f0c0',
318318

319319
'src/flutter/third_party/boringssl':
@@ -628,7 +628,7 @@ deps = {
628628
'src/flutter/third_party/expat':
629629
Var('chromium_git') + '/external/github.com/libexpat/libexpat.git' + '@' + '654d2de0da85662fcc7644a7acd7c2dd2cfb21f0',
630630

631-
'src/third_party/freetype2':
631+
'src/flutter/third_party/freetype2':
632632
Var('flutter_git') + '/third_party/freetype2' + '@' + '3bea2761290a1cbe7d8f75c1c5a7ad727f826a66',
633633

634634
'src/flutter/third_party/skia':
Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
# Copyright 2018 The Fuchsia Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
if (is_fuchsia) {
6+
import("//build/fuchsia/sdk.gni")
7+
}
8+
9+
config("gtest_private_config") {
10+
visibility = [ ":*" ]
11+
include_dirs = [ "googletest" ]
12+
}
13+
14+
config("gtest_config") {
15+
include_dirs = [ "googletest/include" ]
16+
}
17+
18+
static_library("gtest") {
19+
testonly = true
20+
public = [
21+
"googletest/include/gtest/gtest-spi.h",
22+
"googletest/include/gtest/gtest.h",
23+
"googletest/include/gtest/gtest_prod.h",
24+
]
25+
26+
# Only add the "*-all.cc" files (and no headers) to improve maintainability
27+
# from upstream refactoring. The "*-all.cc" files include the respective
28+
# source files.
29+
sources = [ "googletest/src/gtest-all.cc" ]
30+
31+
public_configs = [ ":gtest_config" ]
32+
configs += [ ":gtest_private_config" ]
33+
34+
if (is_fuchsia) {
35+
if (using_fuchsia_sdk) {
36+
deps = [
37+
"$fuchsia_sdk_root/pkg:fdio",
38+
"$fuchsia_sdk_root/pkg:zx",
39+
]
40+
} else {
41+
deps = [
42+
"//zircon/public/lib/fdio",
43+
"//zircon/public/lib/zx",
44+
]
45+
}
46+
}
47+
}
48+
49+
# Library that defines the FRIEND_TEST macro.
50+
source_set("gtest_prod") {
51+
testonly = false
52+
public = [ "googletest/include/gtest/gtest_prod.h" ]
53+
public_configs = [ ":gtest_config" ]
54+
}
55+
56+
static_library("gtest_main") {
57+
testonly = true
58+
sources = [ "googletest/src/gtest_main.cc" ]
59+
public_deps = [ ":gtest" ]
60+
}
61+
62+
config("gmock_private_config") {
63+
visibility = [ ":*" ]
64+
include_dirs = [ "googlemock" ]
65+
}
66+
67+
config("gmock_config") {
68+
include_dirs = [ "googlemock/include" ]
69+
70+
cflags_cc = [
71+
# The MOCK_METHODn() macros do not specify "override", which triggers this
72+
# warning in users: "error: 'Method' overrides a member function but is not
73+
# marked 'override' [-Werror,-Winconsistent-missing-override]". Suppress
74+
# these warnings until https://github.com/google/googletest/issues/533 is
75+
# fixed.
76+
"-Wno-inconsistent-missing-override",
77+
]
78+
}
79+
80+
static_library("gmock") {
81+
testonly = true
82+
public = [ "googlemock/include/gmock/gmock.h" ]
83+
sources = [ "googlemock/src/gmock-all.cc" ]
84+
public_configs = [ ":gmock_config" ]
85+
configs += [ ":gmock_private_config" ]
86+
deps = [ ":gtest" ]
87+
}
88+
89+
static_library("gmock_main") {
90+
testonly = true
91+
sources = [ "googlemock/src/gmock_main.cc" ]
92+
public_deps = [
93+
":gmock",
94+
":gtest",
95+
]
96+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Copyright 2013 The Flutter Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
group("freetype2") {
6+
public_deps = [ "//flutter/third_party/freetype2" ]
7+
}

0 commit comments

Comments
 (0)