Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit a78e875

Browse files
committed
[[ CEF ]] Fix CEF file copying in gyp file
This patch updates the file copying done for CEF prebuilts for the current version of CEF. In particular on linux some files now must be next to `libcef.so` instead of the client process.
1 parent f15adf3 commit a78e875

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

prebuilt/libcef.gyp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
'unpacked/cef/<(uniform_arch)-win32-$(PlatformToolset)_static_$(ConfigurationName)/lib/CEF/cef_100_percent.pak',
4141
'unpacked/cef/<(uniform_arch)-win32-$(PlatformToolset)_static_$(ConfigurationName)/lib/CEF/cef_200_percent.pak',
4242
'unpacked/cef/<(uniform_arch)-win32-$(PlatformToolset)_static_$(ConfigurationName)/lib/CEF/cef_extensions.pak',
43-
'unpacked/cef/<(uniform_arch)-win32-$(PlatformToolset)_static_$(ConfigurationName)/lib/CEF/d3dcompiler_43.dll',
4443
'unpacked/cef/<(uniform_arch)-win32-$(PlatformToolset)_static_$(ConfigurationName)/lib/CEF/d3dcompiler_47.dll',
4544
'unpacked/cef/<(uniform_arch)-win32-$(PlatformToolset)_static_$(ConfigurationName)/lib/CEF/devtools_resources.pak',
4645
'unpacked/cef/<(uniform_arch)-win32-$(PlatformToolset)_static_$(ConfigurationName)/lib/CEF/icudtl.dat',
@@ -137,16 +136,6 @@
137136
{
138137
'copies':
139138
[
140-
{
141-
'destination': '<(PRODUCT_DIR)/',
142-
'files':
143-
[
144-
'lib/linux/<(target_arch)/CEF/natives_blob.bin',
145-
'lib/linux/<(target_arch)/CEF/snapshot_blob.bin',
146-
'lib/linux/<(target_arch)/CEF/v8_context_snapshot.bin',
147-
'lib/linux/<(target_arch)/CEF/icudtl.dat',
148-
],
149-
},
150139
{
151140
'destination': '<(PRODUCT_DIR)/Externals/CEF',
152141
'files':
@@ -157,6 +146,21 @@
157146
'lib/linux/<(target_arch)/CEF/cef_extensions.pak',
158147
'lib/linux/<(target_arch)/CEF/devtools_resources.pak',
159148
'lib/linux/<(target_arch)/CEF/libcef.so',
149+
'lib/linux/<(target_arch)/CEF/libEGL.so',
150+
'lib/linux/<(target_arch)/CEF/libGLESv2.so',
151+
'lib/linux/<(target_arch)/CEF/chrome-sandbox',
152+
'lib/linux/<(target_arch)/CEF/natives_blob.bin',
153+
'lib/linux/<(target_arch)/CEF/snapshot_blob.bin',
154+
'lib/linux/<(target_arch)/CEF/v8_context_snapshot.bin',
155+
'lib/linux/<(target_arch)/CEF/icudtl.dat',
156+
],
157+
},
158+
{
159+
'destination': '<(PRODUCT_DIR)/Externals/CEF/swiftshader',
160+
'files':
161+
[
162+
'lib/linux/<(target_arch)/CEF/swiftshader/libEGL.so',
163+
'lib/linux/<(target_arch)/CEF/swiftshader/libGLESv2.so',
160164
],
161165
},
162166
{
@@ -226,10 +230,6 @@
226230
'dist_aux_files':
227231
[
228232
'<(PRODUCT_DIR)/Externals/',
229-
'<(PRODUCT_DIR)/natives_blob.bin',
230-
'<(PRODUCT_DIR)/snapshot_blob.bin',
231-
'<(PRODUCT_DIR)/v8_context_snapshot.bin',
232-
'<(PRODUCT_DIR)/icudtl.dat',
233233
],
234234
},
235235
},

0 commit comments

Comments
 (0)