Bug 1412983 - part 5 - remove stlport_cppflags dependency from bindgen_cflags_defaults; r=ted.mielczarek
authorNathan Froyd <froydnj@mozilla.com>
Wed, 15 Nov 2017 10:12:22 -0500
changeset 391924 0e6f349c815e0424ede297c7269914330ad986a5
parent 391923 9615a90cf9b030ea72fdc1dd0f42bfa2348aae68
child 391925 b0eedb4c140bcafafc82475b352355a7b5affd3b
push id97367
push usernfroyd@mozilla.com
push dateWed, 15 Nov 2017 15:12:44 +0000
treeherdermozilla-inbound@b0eedb4c140b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted.mielczarek
bugs1412983
milestone59.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 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.)
build/moz.configure/android-ndk.configure
--- 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):