Bug 1144512 - Add b2g build support for API level 22. r=mwu, a=bajaj
authorMichael Vines <mvines@codeaurora.org>
Wed, 18 Mar 2015 14:34:48 -0700
changeset 238006 940cd5079a33
parent 238005 d38672d9b54c
child 238007 ee218cbd5dd1
push id428
push userryanvm@gmail.com
push date2015-04-01 00:17 +0000
treeherdermozilla-b2g37_v2_2@20b67213a047 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmwu, bajaj
bugs1144512
milestone37.0
Bug 1144512 - Add b2g build support for API level 22. r=mwu, a=bajaj
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
@@ -281,17 +281,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=