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

chore: [gn] use merged-in native_mate

Browse source
This commit is contained in:
Jeremy Apthorp 2018-06-29 09:17:04 -07:00
parent 3d4487ccfd
commit 180b41ab73
2 changed files with 21 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

46
BUILD.gn
View file

@ -63,12 +63,8 @@ config("features") {
} }
config("native_mate_config") { config("native_mate_config") {
include_dirs = [ include_dirs = [ "native_mate" ]
"//third_party/native_mate", cflags_cc = [ "-Wno-deprecated-declarations" ]
]
cflags_cc = [
"-Wno-deprecated-declarations",
]
cflags_objcc = cflags_cc cflags_objcc = cflags_cc
} }
@ -81,25 +77,25 @@ source_set("native_mate") {
] ]
public_configs = [ ":native_mate_config" ] public_configs = [ ":native_mate_config" ]
sources = [ sources = [
"//third_party/native_mate/native_mate/arguments.cc", "native_mate/native_mate/arguments.cc",
"//third_party/native_mate/native_mate/arguments.h", "native_mate/native_mate/arguments.h",
"//third_party/native_mate/native_mate/compat.h", "native_mate/native_mate/compat.h",
"//third_party/native_mate/native_mate/constructor.h", "native_mate/native_mate/constructor.h",
"//third_party/native_mate/native_mate/converter.cc", "native_mate/native_mate/converter.cc",
"//third_party/native_mate/native_mate/converter.h", "native_mate/native_mate/converter.h",
"//third_party/native_mate/native_mate/dictionary.cc", "native_mate/native_mate/dictionary.cc",
"//third_party/native_mate/native_mate/dictionary.h", "native_mate/native_mate/dictionary.h",
"//third_party/native_mate/native_mate/function_template.cc", "native_mate/native_mate/function_template.cc",
"//third_party/native_mate/native_mate/function_template.h", "native_mate/native_mate/function_template.h",
"//third_party/native_mate/native_mate/handle.h", "native_mate/native_mate/handle.h",
"//third_party/native_mate/native_mate/object_template_builder.cc", "native_mate/native_mate/object_template_builder.cc",
"//third_party/native_mate/native_mate/object_template_builder.h", "native_mate/native_mate/object_template_builder.h",
"//third_party/native_mate/native_mate/persistent_dictionary.cc", "native_mate/native_mate/persistent_dictionary.cc",
"//third_party/native_mate/native_mate/persistent_dictionary.h", "native_mate/native_mate/persistent_dictionary.h",
"//third_party/native_mate/native_mate/scoped_persistent.h", "native_mate/native_mate/scoped_persistent.h",
"//third_party/native_mate/native_mate/wrappable.cc", "native_mate/native_mate/wrappable.cc",
"//third_party/native_mate/native_mate/wrappable.h", "native_mate/native_mate/wrappable.h",
"//third_party/native_mate/native_mate/wrappable_base.h", "native_mate/native_mate/wrappable_base.h",
] ]
} }

4
DEPS
View file

@ -5,8 +5,6 @@ vars = {
'0628cd925e513bfd873524621a91834b366899f1', '0628cd925e513bfd873524621a91834b366899f1',
'node_version': 'node_version':
'v10.2.0-35-g4879332def', 'v10.2.0-35-g4879332def',
'native_mate_revision':
'875706f66008e03a0c7a699de16d7e2bde0efb90',
'chromium_git': 'chromium_git':
'https://chromium.googlesource.com', 'https://chromium.googlesource.com',
@ -29,8 +27,6 @@ deps = {
(Var("electron_git")) + '/libchromiumcontent.git@' + (Var("libchromiumcontent_revision")), (Var("electron_git")) + '/libchromiumcontent.git@' + (Var("libchromiumcontent_revision")),
'src/third_party/electron_node': 'src/third_party/electron_node':
(Var("electron_git")) + '/node.git@' + (Var("node_version")), (Var("electron_git")) + '/node.git@' + (Var("node_version")),
'src/third_party/native_mate':
(Var("electron_git")) + '/native-mate.git@' + (Var("native_mate_revision")),
} }
hooks = [ hooks = [