Skip to content

Commit 0b97c8e

Browse files
llamasoftrogerwang
authored andcommitted
Update binary packaging to support ARM builds
Fixes nwjs#7378 by removing `natives_blob.bin` from packaging requirements. Also adds support for ARM builds where the NaCl IRT is named differently.
1 parent 9988e1e commit 0b97c8e

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

tools/package_binaries.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
# Init variables.
3131
binaries_location = None # .../out/Release
3232
platform_name = None # win/linux/osx
33-
arch = None # ia32/x64
33+
arch = None # ia32/x64/arm
3434
step = None # nw/chromedriver/symbol
3535
skip = None
3636
nw_ver = None # x.xx
@@ -153,7 +153,6 @@ def generate_target_nw(platform_name, arch, version):
153153
'nw',
154154
'icudtl.dat',
155155
'locales',
156-
'natives_blob.bin',
157156
'v8_context_snapshot.bin',
158157
'lib/libnw.so',
159158
'lib/libnode.so',
@@ -172,12 +171,13 @@ def generate_target_nw(platform_name, arch, version):
172171
target['input'] += ['nacl_helper', 'nacl_helper_bootstrap', 'pnacl']
173172
if arch == 'x64':
174173
target['input'].append('nacl_irt_x86_64.nexe')
175-
else:
174+
elif arch == 'ia32':
176175
target['input'].append('nacl_irt_x86_32.nexe')
176+
else:
177+
target['input'].append('nacl_irt_{}.nexe'.format(arch))
177178

178179
elif platform_name == 'win':
179180
target['input'] = [
180-
'natives_blob.bin',
181181
'v8_context_snapshot.bin',
182182
'd3dcompiler_47.dll',
183183
'libEGL.dll',
@@ -219,7 +219,6 @@ def generate_target_nw(platform_name, arch, version):
219219
target['input'].append('chromedriver')
220220
target['input'].append('libffmpeg.dylib')
221221
target['input'].append('minidump_stackwalk')
222-
target['input'].append('natives_blob.bin')
223222
target['input'].append('v8_context_snapshot.bin')
224223
else:
225224
print 'Unsupported platform: ' + platform_name

0 commit comments

Comments
 (0)