Update Electron build configs for Chromium 67
There are errors about some generated headers not being available. It probably happens because of Jumbo builds. The Great Blink mv for source files, part 2 https://chromium-review.googlesource.com/1001153 Removes web/ lib and dependencies from Blink. https://chromium-review.googlesource.com/602093 Remove web/ finally!!! https://chromium-review.googlesource.com/606812 Move //components/filesystem to //components/services/ https://chromium-review.googlesource.com/c/chromium/src/+/948913
This commit is contained in:
Родитель
8f11427fe9
Коммит
38dbb4c4ca
|
@ -13,8 +13,10 @@ group("targets") {
|
|||
deps += [
|
||||
"//components/prefs",
|
||||
"//components/cookie_config",
|
||||
"//components/pdf/common:interfaces",
|
||||
"//components/security_state/content",
|
||||
"//components/security_state/core",
|
||||
"//components/signin/core/browser:signin_buildflags",
|
||||
"//content",
|
||||
"//content:sandbox_helper_win",
|
||||
"//content/public/app:both",
|
||||
|
@ -251,10 +253,10 @@ if (is_electron_build && !is_component_build) {
|
|||
":skia",
|
||||
":angle",
|
||||
":pdfium",
|
||||
":webkit",
|
||||
":webkitcore",
|
||||
":webkitbindings",
|
||||
":webkitmodules",
|
||||
":blink",
|
||||
":blinkcore",
|
||||
":blinkbindings",
|
||||
":blinkmodules",
|
||||
":webrtc",
|
||||
":v8",
|
||||
":v8base",
|
||||
|
@ -321,24 +323,24 @@ if (is_electron_build && !is_component_build) {
|
|||
sources = obj_pdfium
|
||||
}
|
||||
|
||||
static_library("webkit") {
|
||||
static_library("blink") {
|
||||
complete_static_lib = true
|
||||
sources = obj_webkit
|
||||
sources = obj_blink
|
||||
}
|
||||
|
||||
static_library("webkitbindings") {
|
||||
static_library("blinkbindings") {
|
||||
complete_static_lib = true
|
||||
sources = obj_webkitbindings
|
||||
sources = obj_blinkbindings
|
||||
}
|
||||
|
||||
static_library("webkitcore") {
|
||||
static_library("blinkcore") {
|
||||
complete_static_lib = true
|
||||
sources = obj_webkitcore
|
||||
sources = obj_blinkcore
|
||||
}
|
||||
|
||||
static_library("webkitmodules") {
|
||||
static_library("blinkmodules") {
|
||||
complete_static_lib = true
|
||||
sources = obj_webkitmodules
|
||||
sources = obj_blinkmodules
|
||||
}
|
||||
|
||||
static_library("webrtc") {
|
||||
|
|
|
@ -143,10 +143,12 @@ with open(args.out, 'w') as out:
|
|||
out,
|
||||
"obj_components",
|
||||
[
|
||||
"components/apdu",
|
||||
"components/autofill/core/common",
|
||||
"components/bitmap_uploader",
|
||||
"components/cbor",
|
||||
"components/cdm",
|
||||
"components/certificate_transparency",
|
||||
"components/cookie_config",
|
||||
"components/crash/core/common",
|
||||
"components/device_event_log",
|
||||
|
@ -154,8 +156,6 @@ with open(args.out, 'w') as out:
|
|||
"components/display_compositor",
|
||||
"components/download",
|
||||
"components/filename_generation",
|
||||
"components/filesystem",
|
||||
"components/leveldb",
|
||||
"components/leveldb_proto",
|
||||
"components/link_header_util",
|
||||
"components/memory_coordinator",
|
||||
|
@ -177,10 +177,13 @@ with open(args.out, 'w') as out:
|
|||
"components/scheduler/common",
|
||||
"components/scheduler/scheduler",
|
||||
"components/security_state",
|
||||
"components/services/filesystem",
|
||||
"components/services/leveldb",
|
||||
"components/tracing/proto",
|
||||
"components/tracing/startup_tracing",
|
||||
"components/tracing/tracing",
|
||||
"components/url_formatter",
|
||||
"components/url_matcher",
|
||||
"components/variations",
|
||||
"components/vector_icons",
|
||||
"components/viz/client",
|
||||
|
@ -290,37 +293,36 @@ with open(args.out, 'w') as out:
|
|||
|
||||
gen_list(
|
||||
out,
|
||||
"obj_webkit",
|
||||
"obj_blink",
|
||||
[
|
||||
"third_party/WebKit/common",
|
||||
"third_party/WebKit/public",
|
||||
"third_party/WebKit/Source/controller",
|
||||
"third_party/WebKit/Source/platform",
|
||||
"third_party/WebKit/Source/web",
|
||||
"third_party/blink/common",
|
||||
"third_party/blink/public",
|
||||
"third_party/blink/renderer/controller",
|
||||
"third_party/blink/renderer/platform",
|
||||
],
|
||||
[
|
||||
"third_party/WebKit/Source/platform/character_data_generator"
|
||||
"third_party/blink/renderer/platform/character_data_generator"
|
||||
])
|
||||
|
||||
gen_list(
|
||||
out,
|
||||
"obj_webkitcore",
|
||||
"obj_blinkcore",
|
||||
[
|
||||
"third_party/WebKit/Source/core",
|
||||
"third_party/blink/renderer/core",
|
||||
])
|
||||
|
||||
gen_list(
|
||||
out,
|
||||
"obj_webkitbindings",
|
||||
"obj_blinkbindings",
|
||||
[
|
||||
"third_party/WebKit/Source/bindings",
|
||||
"third_party/blink/renderer/bindings",
|
||||
])
|
||||
|
||||
gen_list(
|
||||
out,
|
||||
"obj_webkitmodules",
|
||||
"obj_blinkmodules",
|
||||
[
|
||||
"third_party/WebKit/Source/modules",
|
||||
"third_party/blink/renderer/modules",
|
||||
])
|
||||
|
||||
gen_list(
|
||||
|
|
|
@ -58,8 +58,8 @@ BINARIES = {
|
|||
'icudtl.dat',
|
||||
'natives_blob.bin',
|
||||
'v8_context_snapshot.bin',
|
||||
os.path.join('gen', 'blink', 'public', 'resources', 'blink_image_resources_200_percent.pak'),
|
||||
os.path.join('gen', 'content', 'app', 'resources', 'content_resources_200_percent.pak'),
|
||||
os.path.join('gen', 'third_party', 'blink', 'public', 'resources', 'blink_image_resources_200_percent.pak'),
|
||||
os.path.join('gen', 'ui', 'resources', 'ui_resources_200_percent.pak'),
|
||||
os.path.join('gen', 'ui', 'resources', 'ui_resources_300_percent.pak'),
|
||||
os.path.join('gen', 'ui', 'views', 'resources', 'views_resources_200_percent.pak'),
|
||||
|
@ -282,10 +282,9 @@ INCLUDE_DIRS = [
|
|||
'third_party/khronos',
|
||||
'third_party/leveldatabase',
|
||||
'third_party/protobuf/src/google/protobuf',
|
||||
'third_party/WebKit/common',
|
||||
'third_party/WebKit/Source/platform',
|
||||
'third_party/WebKit/Source/wtf',
|
||||
'third_party/WebKit/public',
|
||||
'third_party/blink/common',
|
||||
'third_party/blink/public',
|
||||
'third_party/blink/renderer/platform',
|
||||
'third_party/libyuv/include',
|
||||
'third_party/webrtc',
|
||||
'third_party/icu/source',
|
||||
|
@ -310,8 +309,8 @@ GENERATED_INCLUDE_DIRS = [
|
|||
'build',
|
||||
'cc',
|
||||
'components/download/public',
|
||||
'components/filesystem',
|
||||
'components/leveldb',
|
||||
'components/services/filesystem',
|
||||
'components/services/leveldb',
|
||||
'components/payments',
|
||||
'components/ukm',
|
||||
'content',
|
||||
|
@ -323,7 +322,7 @@ GENERATED_INCLUDE_DIRS = [
|
|||
'net',
|
||||
'ppapi',
|
||||
'printing',
|
||||
'third_party/WebKit',
|
||||
'third_party/blink',
|
||||
'ui',
|
||||
'url',
|
||||
'sandbox/mac',
|
||||
|
|
Загрузка…
Ссылка в новой задаче