mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

refactor: move //electron/manifests:manifests target into main BUILD.gn (#17611)

Browse source
This commit is contained in:
Jeremy Apthorp 2019-04-01 18:25:19 -07:00 committed by GitHub
parent 75442b794f
commit eb27e9b055
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
BUILD.gn
View file

@ -2,6 +2,7 @@ import("//build/config/locales.gni")
import("//build/config/ui.gni") import("//build/config/ui.gni")
import("//build/config/win/manifest.gni") import("//build/config/win/manifest.gni")
import("//pdf/features.gni") import("//pdf/features.gni")
import("//printing/buildflags/buildflags.gni")
import("//third_party/ffmpeg/ffmpeg_options.gni") import("//third_party/ffmpeg/ffmpeg_options.gni")
import("//tools/generate_library_loader/generate_library_loader.gni") import("//tools/generate_library_loader/generate_library_loader.gni")
import("//tools/grit/grit_rule.gni") import("//tools/grit/grit_rule.gni")
@ -351,6 +352,28 @@ if (is_linux) {
} }
} }
source_set("manifests") {
sources = [
"//electron/atom/app/manifests.cc",
"//electron/atom/app/manifests.h",
]
include_dirs = [ "//electron" ]
deps = [
"//printing/buildflags",
"//services/proxy_resolver/public/cpp:manifest",
]
if (enable_basic_printing) {
deps += [ "//components/services/pdf_compositor/public/cpp:manifest" ]
}
if (enable_print_preview) {
deps += [ "//chrome/services/printing/public/cpp:manifest" ]
}
}
static_library("electron_lib") { static_library("electron_lib") {
configs += [ "//v8:external_startup_data" ] configs += [ "//v8:external_startup_data" ]
configs += [ "//third_party/electron_node:node_internals" ] configs += [ "//third_party/electron_node:node_internals" ]
@ -359,10 +382,10 @@ static_library("electron_lib") {
deps = [ deps = [
":atom_js2c", ":atom_js2c",
":manifests",
":resources", ":resources",
"buildflags", "buildflags",
"chromium_src:chrome", "chromium_src:chrome",
"manifests",
"native_mate", "native_mate",
"//base:base_static", "//base:base_static",
"//base/allocator:buildflags", "//base/allocator:buildflags",

23
manifests/BUILD.gn
View file

@ -1,23 +0,0 @@
import("//printing/buildflags/buildflags.gni")
source_set("manifests") {
sources = [
"//electron/atom/app/manifests.cc",
"//electron/atom/app/manifests.h",
]
include_dirs = [ "//electron" ]
deps = [
"//printing/buildflags",
"//services/proxy_resolver/public/cpp:manifest",
]
if (enable_basic_printing) {
deps += [ "//components/services/pdf_compositor/public/cpp:manifest" ]
}
if (enable_print_preview) {
deps += [ "//chrome/services/printing/public/cpp:manifest" ]
}
}