Bug 1164921 - part 3 - make more things depend on CONFIG[MOZ_ANDROID_CXX_STL]; r=glandium
authorNathan Froyd <froydnj@mozilla.com>
Thu, 15 Oct 2015 16:29:05 +0900
changeset 301248 198e766e025a34c55a4d08ee586c4f41e850d088
parent 301247 dbf68a6a799a60096c67244300e3d6cf368661ed
child 301249 a792738b876e4283555fddc2c04aeffa7f482bec
push id5392
push userraliiev@mozilla.com
push dateMon, 14 Dec 2015 20:08:23 +0000
treeherdermozilla-beta@16ce8562a975 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1164921
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1164921 - part 3 - make more things depend on CONFIG[MOZ_ANDROID_CXX_STL]; r=glandium
build/templates.mozbuild
toolkit/content/moz.build
--- a/build/templates.mozbuild
+++ b/build/templates.mozbuild
@@ -16,17 +16,18 @@ def Binary():
     # but that variable is actually only set in db/sqlite/src, which
     # doesn't build a shared library on the relevant platforms anyways.
     # Eventually, though, we should detect LIB_IS_C_ONLY based on the
     # associated SOURCES (and there might actually be places where we
     # haven't set it but should have).
     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
 def Program(name):
     '''Template for program executables.'''
     PROGRAM = name
 
     Binary()
--- a/toolkit/content/moz.build
+++ b/toolkit/content/moz.build
@@ -10,17 +10,17 @@ for var in ('target', 'ac_configure_args
             'CXX', 'CXX_VERSION'):
     DEFINES[var] = CONFIG[var]
 
 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']
 
 with Files('aboutTelemetry.*'):
     BUG_COMPONENT = ('Toolkit', 'Telemetry')
 
 with Files('customizeToolbar.*'):