mozilla-central: changeset 392002:0e6f349c815e0424ede297c7269914330ad986a5

author	Nathan Froyd <froydnj@mozilla.com>
	Wed, 15 Nov 2017 10:12:22 -0500
changeset 392002	0e6f349c815e0424ede297c7269914330ad986a5
parent 392001	9615a90cf9b030ea72fdc1dd0f42bfa2348aae68
child 392003	b0eedb4c140bcafafc82475b352355a7b5affd3b
push id	32909
push user	cbrindusan@mozilla.com
push date	Wed, 15 Nov 2017 22:25:14 +0000
treeherder	mozilla-central@f41930a869a8 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	ted.mielczarek
bugs	1412983
milestone	59.0a1
first release with	nightly linux32 f41930a869a8 / 59.0a1 / 20171116100106 / files nightly linux64 f41930a869a8 / 59.0a1 / 20171116100106 / files nightly mac f41930a869a8 / 59.0a1 / 20171116100106 / files nightly win32 f41930a869a8 / 59.0a1 / 20171116100106 / files nightly win64 f41930a869a8 / 59.0a1 / 20171116100106 / files
last release without	nightly linux32 45715ece25fc / 59.0a1 / 20171115100050 / files nightly linux64 45715ece25fc / 59.0a1 / 20171115100050 / files nightly mac 45715ece25fc / 59.0a1 / 20171115100050 / files nightly win32 45715ece25fc / 59.0a1 / 20171115100050 / files nightly win64 45715ece25fc / 59.0a1 / 20171115100050 / files

Bug 1412983 - part 5 - remove stlport_cppflags dependency from bindgen_cflags_defaults; r=ted.mielczarek Now that extra_toolchain_flags includes stlport_cppflags, there's no reason bindgen_cflags_defaults should depend on them both. So remove the stlport_cppflags dependency. (There's no harm to multiply-including stlport_cppflags, but not repeating -I options is good practice.)

--- a/build/moz.configure/android-ndk.configure
+++ b/build/moz.configure/android-ndk.configure
@@ -258,33 +258,31 @@ def android_toolchain_prefix(prefix_base
     if toolchain:
         return '%s/bin/%s-' % (toolchain, prefix_base)
 
 
 imply_option('--with-toolchain-prefix', android_toolchain_prefix,
              reason='--with-android-ndk')
 
 
-@depends(stlport_cppflags, extra_toolchain_flags, android_toolchain,
+@depends(extra_toolchain_flags, android_toolchain,
          android_toolchain_prefix_base, '--help')
 @imports(_from='os.path', _import='isdir')
-def bindgen_cflags_defaults(stlport_cppflags, toolchain_flags,
-                            toolchain, toolchain_prefix, _):
-    if not stlport_cppflags:
+def bindgen_cflags_defaults(toolchain_flags, toolchain, toolchain_prefix, _):
+    if not toolchain_flags:
         return
 
     gcc_include = os.path.join(
         toolchain, 'lib', 'gcc', toolchain_prefix, '4.9.x')
     if not isdir(gcc_include):
         gcc_include = os.path.join(
             toolchain, 'lib', 'gcc', toolchain_prefix, '4.9')
 
-    cflags_format = "%s %s -I%s -I%s"
-    return cflags_format % (' '.join(stlport_cppflags),
-                            ' '.join(toolchain_flags),
+    cflags_format = "%s -I%s -I%s"
+    return cflags_format % (' '.join(toolchain_flags),
                             os.path.join(gcc_include, 'include'),
                             os.path.join(gcc_include, 'include-fixed'))
 
 
 @depends(host, ndk)
 @imports(_from='os.path', _import='exists')
 @imports(_from='os.path', _import='isdir')
 def android_clang_compiler(host, ndk):