wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1164921 - part 3 - make more things depend on CONFIG[MOZ_ANDROID_CXX_STL]; r=glandium

Browse Source
This commit is contained in:
Nathan Froyd 2015-10-15 16:29:05 +09:00 committed by Mike Hommey
parent 58e3e05ab6
commit 1200b16f65
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/templates.mozbuild
View File

@ -21,7 +21,8 @@ def Binary():
if CONFIG['STLPORT_LIBS']:
OS_LIBS += [CONFIG['STLPORT_LIBS']]
elif CONFIG['OS_TARGET'] == 'Android':
USE_LIBS += ['stlport']
if CONFIG['MOZ_ANDROID_CXX_STL'] == 'mozstlport':
USE_LIBS += ['stlport']
@template

2
toolkit/content/moz.build
View File

@ -15,7 +15,7 @@ DEFINES['CFLAGS'] = CONFIG['OS_CFLAGS']
if CONFIG['OS_TARGET'] == 'Android':
DEFINES['ANDROID_PACKAGE_NAME'] = CONFIG['ANDROID_PACKAGE_NAME']
if 'stlport' in CONFIG['STLPORT_LIBS']:
if CONFIG['MOZ_ANDROID_CXX_STL'] == 'mozstlport':
DEFINES['USE_STLPORT'] = True
JAR_MANIFESTS += ['jar.mn']