Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix libpackager_type variable undefined by default 

In e2efb5d4, I fixed shared_library builds on Windows, but I
introduced another issue in which the libpackager_type variable was
not correctly defined by default.  This meant that the build only
worked with this variable explicitly-defined in GYP_DEFINES when
gclient sync was run.

This fixes the default definition so that libpackager_type does not
need to be defined explicity.

Related to #318 (shared_library builds on Windows)

Issue #336 (progress toward GitHub Actions workflow to replace Travis
  and Appveyor, where we need to build and test shared_library on all
  platforms)

b/190743862 (internal; tracking replacement of Travis)

Change-Id: If353e1d3c312ab0c568d4d4d2b789e922d7216e1
This commit is contained in:
Joey Parrish 2021-06-16 09:32:26 -07:00 committed by Joey Parrish
parent 098f58a143
commit 032cf2a345
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packager/common.gypi
View File

@ -12,11 +12,12 @@
'shaka_code%': 0, 'shaka_code%': 0,
# musl is a lightweight C standard library used in Alpine Linux. # musl is a lightweight C standard library used in Alpine Linux.
'musl%': 0, 'musl%': 0,
'libpackager_type%': 'static_library',
}, },
'shaka_code%': '<(shaka_code)', 'shaka_code%': '<(shaka_code)',
'musl%': '<(musl)', 'musl%': '<(musl)',
'libpackager_type%': 'static_library', 'libpackager_type%': '<(libpackager_type)',
'conditions': [ 'conditions': [
['shaka_code==1', { ['shaka_code==1', {