[embedlite] FAIL_ON_WARNINGS cannot be declared in moz.build files

This commit also disables system nss as that is currently too old.
sailfishos · Dec 19, 2016 · 36eae2b · 36eae2b
1 parent 91e1c05
commit 36eae2b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/embedding/embedlite/config/mozconfig.merqtxulrunner b/embedding/embedlite/config/mozconfig.merqtxulrunner
@@ -6,13 +6,14 @@ export MOZILLA_OFFICIAL=1
 
 mk_add_options PROFILE_GEN_SCRIPT=@TOPSRCDIR@/build/profile_pageloader.pl
 
-export CXXFLAGS="$CXXFLAGS -DUSE_ANDROID_OMTC_HACKS=1 "
+export CXXFLAGS="$CXXFLAGS -DUSE_ANDROID_OMTC_HACKS=1 -DUSE_OZONE=1"
 
 ac_add_options --prefix=/usr
 
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
+# ac_add_options --with-system-nss
+ac_add_options --disable-ffmpeg
 ac_add_options --enable-system-sqlite
 
 ac_add_options --without-x
@@ -35,6 +36,9 @@ ac_add_options --disable-gamepad
 ac_add_options --disable-printing
 ac_add_options --disable-crashreporter
 
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+# ac_add_options --enable-warnings-as-errors
+
 # disabling for now, since the build fails...
 ac_add_options --enable-webrtc
 ac_add_options --enable-profiling

diff --git a/embedding/embedlite/moz.build b/embedding/embedlite/moz.build
@@ -12,8 +12,6 @@ JS_PREFERENCE_FILES += [
 if CONFIG['ENABLE_TESTS']:
     DIRS += ['tests/gtest']
 
-FAIL_ON_WARNINGS = True
-
 FINAL_LIBRARY = 'xul'
 
 XPIDL_SOURCES += [