Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 22:05:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1203513 - Add LD_LIBRARY_PATH in Emulator build script. r=dustin

Browse Source
This commit is contained in:
John Dai 2015-09-13 19:27:00 +02:00
parent b48912a8b8
commit 46b6072ee1
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
testing/mozharness/scripts/b2g_build.py
View File

@ -540,6 +540,18 @@ class B2GBuild(LocalesMixin, PurgeMixin,
cmd.append(target)
return cmd
def symlink_gtk3(self):
dirs = self.query_abs_dirs()
gtk3_path = os.path.join(dirs['abs_work_dir'], 'gtk3')
gtk3_symlink_path = os.path.join(dirs['abs_work_dir'], 'gecko', 'gtk3')
if os.path.isdir(gtk3_path):
cmd = ["ln", "-s", gtk3_path, gtk3_symlink_path]
retval = self.run_command(cmd)
if retval != 0:
self.error("failed to create symlink")
self.return_code = 2
def build(self):
dirs = self.query_abs_dirs()
gecko_config = self.load_gecko_config()
@ -549,7 +561,14 @@ class B2GBuild(LocalesMixin, PurgeMixin,
cmds = [self.generate_build_command()]
else:
cmds = [self.generate_build_command(t) for t in build_targets]
self.symlink_gtk3()
env = self.query_build_env()
env['LD_LIBRARY_PATH'] = os.environ.get('LD_LIBRARY_PATH')
if env['LD_LIBRARY_PATH'] is None:
env['LD_LIBRARY_PATH'] = os.path.join(dirs['abs_work_dir'], 'gecko', 'gtk3', 'usr', 'local', 'lib')
else:
env['LD_LIBRARY_PATH'] += ':%s' % os.path.join(dirs['abs_work_dir'], 'gecko', 'gtk3', 'usr', 'local', 'lib')
if self.config.get('gaia_languages_file'):
env['LOCALE_BASEDIR'] = dirs['gaia_l10n_base_dir']
env['LOCALES_FILE'] = os.path.join(dirs['abs_work_dir'], 'gaia', self.config['gaia_languages_file'])