Fix bug 1165428 - Restore support for binary components on a per-application basis. r=bsmedberg
authorPhilipp Kewisch <mozilla@kewis.ch>
Wed, 20 May 2015 20:01:27 +0200
changeset 244802 08084ee427ecd4e7348e09e752ae03d1c8721116
parent 244801 2040569ec5c48d42b87d47214585baf07ec6d92d
child 244803 df6daac07473afdef804f67251176a4eb2fba9cc
push id60040
push usermozilla@kewis.ch
push dateWed, 20 May 2015 23:53:56 +0000
treeherdermozilla-inbound@08084ee427ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs1165428
milestone41.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
Fix bug 1165428 - Restore support for binary components on a per-application basis. r=bsmedberg
configure.in
xpcom/components/ManifestParser.cpp
--- a/configure.in
+++ b/configure.in
@@ -3899,16 +3899,17 @@ ACCESSIBILITY=1
 MOZ_TIME_MANAGER=
 MOZ_SIMPLEPUSH=
 MOZ_PAY=
 MOZ_AUDIO_CHANNEL_MANAGER=
 NSS_NO_LIBPKIX=
 MOZ_CONTENT_SANDBOX=
 MOZ_GMP_SANDBOX=
 MOZ_SANDBOX=1
+MOZ_BINARY_EXTENSIONS=
 
 case "$target_os" in
     mingw*)
         NS_ENABLE_TSF=1
         AC_DEFINE(NS_ENABLE_TSF)
         ;;
 esac
 
@@ -8518,16 +8519,20 @@ AC_SUBST(MOZ_FIX_LINK_PATHS)
 AC_SUBST(USE_DEPENDENT_LIBS)
 
 AC_SUBST(MOZ_BUILD_ROOT)
 
 AC_SUBST(MOZ_POST_DSO_LIB_COMMAND)
 AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
 AC_SUBST(MOZ_LINKER_EXTRACT)
 
+if test -n "$MOZ_BINARY_EXTENSIONS"; then
+  AC_DEFINE(MOZ_BINARY_EXTENSIONS)
+fi
+
 AC_SUBST(MOZ_JSDOWNLOADS)
 if test -n "$MOZ_JSDOWNLOADS"; then
   AC_DEFINE(MOZ_JSDOWNLOADS)
 fi
 
 dnl ========================================================
 dnl = Mac bundle name prefix
 dnl ========================================================
--- a/xpcom/components/ManifestParser.cpp
+++ b/xpcom/components/ManifestParser.cpp
@@ -652,21 +652,23 @@ ParseManifest(NSLocationType aType, File
 
     if (!directive->allowbootstrap && NS_BOOTSTRAPPED_LOCATION == aType) {
       LogMessageWithContext(aFile, line,
                             "Bootstrapped manifest not allowed to use '%s' directive.",
                             token);
       continue;
     }
 
+#ifndef MOZ_BINARY_EXTENSIONS
     if (directive->apponly && NS_APP_LOCATION != aType) {
       LogMessageWithContext(aFile, line,
                             "Only application manifests may use the '%s' directive.", token);
       continue;
     }
+#endif
 
     if (directive->componentonly && NS_SKIN_LOCATION == aType) {
       LogMessageWithContext(aFile, line,
                             "Skin manifest not allowed to use '%s' directive.",
                             token);
       continue;
     }