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

Unified Diff: base/BUILD.gn

Issue 2797343002: Get rid of the base_paths target. (Closed)
Patch Set: add is_linux Created 3 years, 8 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/BUILD.gn
diff --git a/base/BUILD.gn b/base/BUILD.gn
index b4a5c47a3cc975737099557b535bba2d92015870..a6d07b6bc78e4aaa273f9b55d80a1e6ba73d973d 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -87,35 +87,6 @@ if (is_nacl_nonsfi) {
}
}
-if (is_nacl) {
- # None of the files apply to nacl, and we can't make an empty static library.
- group("base_paths") {
- }
-} else {
- static_library("base_paths") {
- sources = [
- "base_paths.cc",
- "base_paths.h",
- "base_paths_android.cc",
- "base_paths_android.h",
- "base_paths_mac.h",
- "base_paths_mac.mm",
- "base_paths_posix.cc",
- "base_paths_posix.h",
- "base_paths_win.cc",
- "base_paths_win.h",
- ]
-
- if (is_android || is_mac || is_ios) {
- sources -= [ "base_paths_posix.cc" ]
- }
-
- configs += [ ":base_implementation" ]
-
- visibility = [ ":base" ]
- }
-}
-
if (is_android) {
config("android_system_libs") {
libs = [ "log" ] # Used by logging.cc.
@@ -1114,6 +1085,24 @@ component("base") {
"win/wrapped_window_proc.h",
]
+ if (!is_nacl) {
+ sources += [
+ "base_paths.cc",
+ "base_paths.h",
+ "base_paths_android.cc",
+ "base_paths_android.h",
+ "base_paths_mac.h",
+ "base_paths_mac.mm",
+ "base_paths_posix.h",
+ "base_paths_win.cc",
+ "base_paths_win.h",
+ ]
+
+ if (is_linux) {
+ sources += [ "base_paths_posix.cc" ]
+ }
+ }
+
all_dependent_configs = []
defines = []
data = []
@@ -1133,7 +1122,6 @@ component("base") {
]
public_deps = [
- ":base_paths",
":base_static",
":build_date",
":debugging_flags",
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698