Merge inbound to mozilla-central. a=merge

sailfishos · Feb 27, 2018 · 9bffb6a · 9bffb6a
2 parents 6d345d0 + c24507a
commit 9bffb6a
Show file tree

Hide file tree

Showing 76 changed files with 1,502 additions and 918 deletions.
diff --git a/browser/config/mozconfigs/linux64/stylo-only b/browser/config/mozconfigs/linux64/stylo-only
@@ -0,0 +1,3 @@
+. "$topsrcdir/browser/config/mozconfigs/linux64/nightly"
+
+ac_add_options --enable-stylo=only
diff --git a/browser/config/mozconfigs/linux64/stylo-only-debug b/browser/config/mozconfigs/linux64/stylo-only-debug
@@ -0,0 +1,3 @@
+. "$topsrcdir/browser/config/mozconfigs/linux64/debug"
+
+ac_add_options --enable-stylo=only
diff --git a/build/Makefile.in b/build/Makefile.in
diff --git a/config/makefiles/test/Makefile.in b/config/makefiles/test/Makefile.in
diff --git a/config/makefiles/test/check-arglist.mk b/config/makefiles/test/check-arglist.mk
diff --git a/config/makefiles/test/check-autotargets.mk b/config/makefiles/test/check-autotargets.mk
diff --git a/config/makefiles/test/check_XinY.mk b/config/makefiles/test/check_XinY.mk
diff --git a/config/makefiles/test/moz.build b/config/makefiles/test/moz.build
diff --git a/config/moz.build b/config/moz.build
@@ -16,7 +16,6 @@ DIST_INSTALL = False
 NoVisibilityFlags()
 
 CONFIGURE_SUBST_FILES += [
-    'makefiles/test/Makefile',
     'tests/src-simple/Makefile',
 ]