Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 02:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1295516 - Do not build B2G with RTSP enabled r?

Browse Source 
MozReview-Commit-ID: heTGRgh3am

--HG--
extra : rebase_source : 3c64aeece2a7ea608b8cb9baa70eb01317c8ca3b
This commit is contained in:
Alexandre Lissy 2016-08-16 11:24:44 +02:00
parent 0c1756a66f
commit 0ce8616941
3 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
b2g/installer/Makefile.in
View File

@ -94,10 +94,6 @@ ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET)))
DEFINES += -DMOZ_SHARED_MOZGLUE=1
endif
ifneq (,$(filter rtsp,$(NECKO_PROTOCOLS)))
DEFINES += -DMOZ_RTSP
endif
DEFINES += -DMOZ_ICU_VERSION=$(MOZ_ICU_VERSION)
ifdef MOZ_SYSTEM_ICU
DEFINES += -DMOZ_SYSTEM_ICU

3
b2g/installer/package-manifest.in
View File

@ -273,9 +273,6 @@
@RESPATH@/components/necko_websocket.xpt
@RESPATH@/components/necko_wifi.xpt
@RESPATH@/components/necko_wyciwyg.xpt
#ifdef MOZ_RTSP
@RESPATH@/components/necko_rtsp.xpt
#endif
@RESPATH@/components/necko.xpt
@RESPATH@/components/loginmgr.xpt
@RESPATH@/components/parentalcontrols.xpt

7
old-configure.in
View File

@ -111,12 +111,10 @@ if test -n "$gonkdir"; then
MOZ_B2G_CAMERA=1
MOZ_OMX_DECODER=1
AC_SUBST(MOZ_OMX_DECODER)
MOZ_RTSP=1
MOZ_SECUREELEMENT=1
;;
17|18)
CPPFLAGS="-I$gonkdir/frameworks/native/include -I$gonkdir/frameworks/av/include -I$gonkdir/frameworks/av/include/media -I$gonkdir/frameworks/av/include/camera -I$gonkdir/frameworks/native/include/media/openmax -I$gonkdir/frameworks/av/media/libstagefright/include $CPPFLAGS"
MOZ_RTSP=1
MOZ_NFC=1
MOZ_B2G_CAMERA=1
MOZ_OMX_DECODER=1
@ -130,7 +128,6 @@ if test -n "$gonkdir"; then
CPPFLAGS="-I$gonkdir/frameworks/native/include -I$gonkdir/frameworks/av/include -I$gonkdir/frameworks/av/include/media -I$gonkdir/frameworks/av/include/camera -I$gonkdir/frameworks/native/include/media/openmax -I$gonkdir/frameworks/av/media/libstagefright/include $CPPFLAGS"
MOZ_B2G_CAMERA=1
MOZ_NFC=1
MOZ_RTSP=1
MOZ_OMX_DECODER=1
MOZ_OMX_ENCODER=1
AC_DEFINE(MOZ_OMX_ENCODER)
@ -149,7 +146,6 @@ if test -n "$gonkdir"; then
AC_DEFINE(MOZ_AUDIO_OFFLOAD)
MOZ_B2G_CAMERA=1
MOZ_NFC=1
MOZ_RTSP=1
;;
*)
AC_MSG_ERROR([Unsupported platform version: $android_version])
@ -2382,9 +2378,6 @@ MOZ_NO_SMART_CARDS=
NSS_DISABLE_DBM=
NECKO_COOKIES=1
NECKO_PROTOCOLS_DEFAULT="about data file ftp http res viewsource websocket wyciwyg device"
if test -n "$MOZ_RTSP"; then
NECKO_PROTOCOLS_DEFAULT="$NECKO_PROTOCOLS_DEFAULT rtsp"
fi
BUILD_CTYPES=1
MOZ_USE_NATIVE_POPUP_WINDOWS=
MOZ_WEBSMS_BACKEND=