Bug 1144512 - Add b2g build support for API level 22. r=mwu
authorMichael Vines <mvines@codeaurora.org>
Wed, 18 Mar 2015 14:34:48 -0700
changeset 236506 256daeb9f1af
parent 236505 8da5d927c19f
child 236507 7bd2bc8251bf
push id28511
push userkwierso@gmail.com
push date2015-03-31 02:34 +0000
treeherdermozilla-central@8af276ab8636 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmwu
bugs1144512
milestone39.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 1144512 - Add b2g build support for API level 22. r=mwu From a49c14cf336031e9a69f07a422cf19b906e61e58 Mon Sep 17 00:00:00 2001 Change-Id: Ibd833ee7d74716d86d23a5b664a7e414211d18b7 --- b2g/app/moz.build | 2 +- configure.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
b2g/app/moz.build
configure.in
--- a/b2g/app/moz.build
+++ b/b2g/app/moz.build
@@ -53,17 +53,17 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
     OS_LIBS += [
         'ui',
         'EGL',
         'hardware_legacy',
         'hardware',
         'cutils',
     ]
     OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
-    if CONFIG['ANDROID_VERSION'] in ('17', '18', '19', '21'):
+    if CONFIG['ANDROID_VERSION'] in ('17', '18', '19', '21', '22'):
         OS_LIBS += [
             'gui',
             'suspend',
         ]
     OS_LIBS += [
         'binder',
         'utils',
     ]
--- a/configure.in
+++ b/configure.in
@@ -283,17 +283,17 @@ if test -n "$gonkdir" ; then
         MOZ_OMX_ENCODER=1
         AC_DEFINE(MOZ_OMX_ENCODER)
         MOZ_AUDIO_OFFLOAD=1
         MOZ_SECUREELEMENT=1
         AC_SUBST(MOZ_AUDIO_OFFLOAD)
         AC_DEFINE(MOZ_AUDIO_OFFLOAD)
         MOZ_FMP4=1
         ;;
-    21)
+    21|22)
         GONK_INCLUDES="-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"
         MOZ_AUDIO_OFFLOAD=1
         MOZ_OMX_DECODER=1
         MOZ_OMX_ENCODER=1
         AC_DEFINE(MOZ_OMX_ENCODER)
         AC_SUBST(MOZ_AUDIO_OFFLOAD)
         AC_DEFINE(MOZ_AUDIO_OFFLOAD)
         MOZ_FMP4=