Merge pull request #12987 from electron/fix-arm-release-build

Fix ARM Release build
This commit is contained in:
John Kleinschmidt 2018-05-18 08:17:06 -04:00 committed by GitHub
commit 91173320e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -164,14 +164,21 @@
],
},
}],
# This lib does not exist on arm.
['target_arch=="arm"', {
'link_settings': {
'libraries!': [
'<(libchromiumcontent_dir)/libdesktop_capture_differ_sse2.a',
],
},
}],
# Due to strange linker behavior, component build of arm needs to
# be linked with libjpeg.a explicitly.
['target_arch=="arm" and libchromiumcontent_component==1', {
'link_settings': {
'libraries': [
'<(libchromiumcontent_dir)/libjpeg.a',
],
'libraries!': [
'<(libchromiumcontent_dir)/libdesktop_capture_differ_sse2.a',
],
},
}],
],