Bug 961925 - Move MOZ_OMX_ENCODER definition from local moz.build to global configuration file. r=gps
authorJohn Lin <jolin@mozilla.com>
Thu, 23 Jan 2014 09:32:32 -0500
changeset 180903 78f153e238319397ba555cc26677f25d9cabcb9e
parent 180902 921523a69a9ba73ddf8306de279d62f41393505b
child 180904 9dfc66b2a21f1f7781596ea8ed5b458e7e5e2afc
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs961925
milestone29.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 961925 - Move MOZ_OMX_ENCODER definition from local moz.build to global configuration file. r=gps
configure.in
content/media/encoder/moz.build
--- a/configure.in
+++ b/configure.in
@@ -242,16 +242,17 @@ if test -n "$gonkdir" ; then
 
         MOZ_RTSP=1
         MOZ_NFC=1
         MOZ_B2G_CAMERA=1
         MOZ_OMX_DECODER=1
         AC_SUBST(MOZ_OMX_DECODER)
         MOZ_OMX_ENCODER=1
         AC_SUBST(MOZ_OMX_ENCODER)
+        AC_DEFINE(MOZ_OMX_ENCODER)
         ;;
     19)
         GONK_INCLUDES="-I$gonkdir/frameworks/native/include"
         MOZ_B2G_BT=1
         MOZ_B2G_BT_BLUEDROID=1
         MOZ_NFC=1
 
         ;;
--- a/content/media/encoder/moz.build
+++ b/content/media/encoder/moz.build
@@ -20,17 +20,16 @@ UNIFIED_SOURCES += [
     'TrackEncoder.cpp',
 ]
 
 if CONFIG['MOZ_OPUS']:
     EXPORTS += ['OpusTrackEncoder.h']
     UNIFIED_SOURCES += ['OpusTrackEncoder.cpp']
 
 if CONFIG['MOZ_OMX_ENCODER']:
-    DEFINES['MOZ_OMX_ENCODER'] = True
     EXPORTS += ['OmxTrackEncoder.h']
     UNIFIED_SOURCES += ['OmxTrackEncoder.cpp']
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'gklayout'
 
 include('/ipc/chromium/chromium-config.mozbuild')