-
Notifications
You must be signed in to change notification settings - Fork 1
/
update_dist_path.diff
108 lines (108 loc) · 7.15 KB
/
update_dist_path.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp
index 1a407ff54..11784003a 100644
--- a/brightray/brightray.gyp
+++ b/brightray/brightray.gyp
@@ -327,46 +327,46 @@
'-ld3d11.lib',
'-ldxgi.lib',
# Following libs are always linked statically.
- '<(libchromiumcontent_dir)/base_static.lib',
- '<(libchromiumcontent_dir)/sandbox.lib',
- '<(libchromiumcontent_dir)/sandbox_helper_win.lib',
- '<(libchromiumcontent_dir)/http_server.lib',
- '<(libchromiumcontent_dir)/desktop_capture.lib',
- '<(libchromiumcontent_dir)/dom_keycode_converter.lib',
- '<(libchromiumcontent_dir)/rtc_base.lib',
- '<(libchromiumcontent_dir)/rtc_base_generic.lib',
- '<(libchromiumcontent_dir)/system_wrappers.lib',
- '<(libchromiumcontent_dir)/webrtc_common.lib',
- '<(libchromiumcontent_dir)/init_webrtc.lib',
- '<(libchromiumcontent_dir)/libyuv.lib',
- '<(libchromiumcontent_dir)/renderer.lib',
- '<(libchromiumcontent_dir)/security_state.lib',
+ '<(libchromiumcontent_dir)/obj/base/base_static.lib',
+ '<(libchromiumcontent_dir)/obj/sandbox/win/sandbox.lib',
+ '<(libchromiumcontent_dir)/obj/chromiumcontent/sandbox_helper_win.lib',
+ '<(libchromiumcontent_dir)/obj/net/http_server.lib',
+ '<(libchromiumcontent_dir)/obj/chromiumcontent/desktop_capture.lib',
+ '<(libchromiumcontent_dir)/obj/ui/events/dom_keycode_converter.lib',
+ '<(libchromiumcontent_dir)/obj/third_party/webrtc/rtc_base/rtc_base.lib',
+ '<(libchromiumcontent_dir)/obj/third_party/webrtc/rtc_base/rtc_base_generic.lib',
+ '<(libchromiumcontent_dir)/obj/chromiumcontent/system_wrappers.lib',
+ '<(libchromiumcontent_dir)/obj/chromiumcontent/webrtc_common.lib',
+ '<(libchromiumcontent_dir)/obj/third_party/webrtc_overrides/init_webrtc.lib',
+ '<(libchromiumcontent_dir)/obj/chromiumcontent/libyuv.lib',
+ '<(libchromiumcontent_dir)/obj/components/cdm/renderer/renderer.lib',
+ '<(libchromiumcontent_dir)/obj/chromiumcontent/security_state.lib',
# components/network_session_configurator/common/
- '<(libchromiumcontent_dir)/common.lib',
+ '<(libchromiumcontent_dir)/obj/components/network_session_configurator/common/common.lib',
# services/device/wake_lock/power_save_blocker/
- '<(libchromiumcontent_dir)/power_save_blocker.lib',
+ '<(libchromiumcontent_dir)/obj/services/device/wake_lock/power_save_blocker/power_save_blocker.lib',
# Friends of pdf.lib:
- '<(libchromiumcontent_dir)/pdf.lib',
- '<(libchromiumcontent_dir)/ppapi_cpp_objects.lib',
- '<(libchromiumcontent_dir)/ppapi_internal_module.lib',
- '<(libchromiumcontent_dir)/libjpeg.lib',
- '<(libchromiumcontent_dir)/pdfium.lib',
- '<(libchromiumcontent_dir)/fdrm.lib',
- '<(libchromiumcontent_dir)/formfiller.lib',
- '<(libchromiumcontent_dir)/fpdfapi.lib',
- '<(libchromiumcontent_dir)/fpdfdoc.lib',
- '<(libchromiumcontent_dir)/fpdftext.lib',
- '<(libchromiumcontent_dir)/fpdftext.lib',
- '<(libchromiumcontent_dir)/fxcodec.lib',
- '<(libchromiumcontent_dir)/fxcrt.lib',
- '<(libchromiumcontent_dir)/fxge.lib',
- '<(libchromiumcontent_dir)/fxjs.lib',
- '<(libchromiumcontent_dir)/javascript.lib',
- '<(libchromiumcontent_dir)/pwl.lib',
- '<(libchromiumcontent_dir)/fx_agg.lib',
- '<(libchromiumcontent_dir)/fx_lcms2.lib',
- '<(libchromiumcontent_dir)/fx_libopenjpeg.lib',
- '<(libchromiumcontent_dir)/fx_zlib.lib',
+ '<(libchromiumcontent_dir)/obj/pdf/pdf.lib',
+ '<(libchromiumcontent_dir)/obj/chromiumcontent/ppapi_cpp_objects.lib',
+ '<(libchromiumcontent_dir)/obj/chromiumcontent/ppapi_internal_module.lib',
+ '<(libchromiumcontent_dir)/obj/chromiumcontent/libjpeg.lib',
+ '<(libchromiumcontent_dir)/obj/third_party/pdfium/pdfium.lib',
+ '<(libchromiumcontent_dir)/obj/third_party/pdfium/fdrm.lib',
+ '<(libchromiumcontent_dir)/obj/third_party/pdfium/formfiller.lib',
+ '<(libchromiumcontent_dir)/obj/third_party/pdfium/fpdfapi.lib',
+ '<(libchromiumcontent_dir)/obj/third_party/pdfium/fpdfdoc.lib',
+ '<(libchromiumcontent_dir)/obj/third_party/pdfium/fpdftext.lib',
+ '<(libchromiumcontent_dir)/obj/third_party/pdfium/fpdftext.lib',
+ '<(libchromiumcontent_dir)/obj/third_party/pdfium/fxcodec.lib',
+ '<(libchromiumcontent_dir)/obj/third_party/pdfium/fxcrt.lib',
+ '<(libchromiumcontent_dir)/obj/third_party/pdfium/fxge.lib',
+ '<(libchromiumcontent_dir)/obj/third_party/pdfium/fxjs.lib',
+ '<(libchromiumcontent_dir)/obj/third_party/pdfium/javascript.lib',
+ '<(libchromiumcontent_dir)/obj/third_party/pdfium/pwl.lib',
+ '<(libchromiumcontent_dir)/obj/chromiumcontent/fx_agg.lib',
+ '<(libchromiumcontent_dir)/obj/chromiumcontent/fx_lcms2.lib',
+ '<(libchromiumcontent_dir)/obj/chromiumcontent/fx_libopenjpeg.lib',
+ '<(libchromiumcontent_dir)/obj/chromiumcontent/fx_zlib.lib',
],
},
}, {
diff --git a/electron.gyp b/electron.gyp
index 19bf70d89..32a33c22c 100644
--- a/electron.gyp
+++ b/electron.gyp
@@ -190,11 +190,11 @@
'<(libchromiumcontent_dir)/libEGL.dll',
'<(libchromiumcontent_dir)/libGLESv2.dll',
'<(libchromiumcontent_dir)/icudtl.dat',
- '<(libchromiumcontent_dir)/blink_image_resources_200_percent.pak',
- '<(libchromiumcontent_dir)/content_resources_200_percent.pak',
+ '<(libchromiumcontent_dir)/gen/blink/public/resources/blink_image_resources_200_percent.pak',
+ '<(libchromiumcontent_dir)/gen/content/app/resources/content_resources_200_percent.pak',
'<(libchromiumcontent_dir)/content_shell.pak',
- '<(libchromiumcontent_dir)/ui_resources_200_percent.pak',
- '<(libchromiumcontent_dir)/views_resources_200_percent.pak',
+ '<(libchromiumcontent_dir)/gen/ui/resources/ui_resources_200_percent.pak',
+ '<(libchromiumcontent_dir)/gen/ui/views/resources/views_resources_200_percent.pak',
'<(libchromiumcontent_dir)/natives_blob.bin',
'<(libchromiumcontent_dir)/snapshot_blob.bin',
'external_binaries/d3dcompiler_47.dll',