| 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",
|
|
|