Bug 1341990 - Part 2: Make ExoPlayer build against Android SDK 23. r?sebastian draft
authorNick Alexander <nalexander@mozilla.com>
Fri, 24 Feb 2017 11:15:52 -0800
changeset 489321 c7739fc5a3975df34f9364338a11354231764946
parent 489320 b36ecd99350706e425dee12a82459f16bce88059
child 489322 91f3617688d528ba1efc3d1081a76dd998d8850e
push id46805
push usernalexander@mozilla.com
push dateFri, 24 Feb 2017 19:18:22 +0000
reviewerssebastian
bugs1341990
milestone54.0a1
Bug 1341990 - Part 2: Make ExoPlayer build against Android SDK 23. r?sebastian Right now, Fennec builds against Android SDK 23. ExoPlayer expects to build against Android SDK 24 (but targets Android platform 9 and above). This tiny tweak allows ExoPlayer to build against Android SDK 23. Alternatively, we might bump the version of the Android SDK that Fennec builds against, since keeping that current is generally a good idea. MozReview-Commit-ID: 9aqyM9jAH39
mobile/android/thirdparty/com/google/android/exoplayer2/C.java
--- a/mobile/android/thirdparty/com/google/android/exoplayer2/C.java
+++ b/mobile/android/thirdparty/com/google/android/exoplayer2/C.java
@@ -91,17 +91,17 @@ public final class C {
    * @see MediaCodec#CRYPTO_MODE_AES_CTR
    */
   @SuppressWarnings("InlinedApi")
   public static final int CRYPTO_MODE_AES_CTR = MediaCodec.CRYPTO_MODE_AES_CTR;
   /**
    * @see MediaCodec#CRYPTO_MODE_AES_CBC
    */
   @SuppressWarnings("InlinedApi")
-  public static final int CRYPTO_MODE_AES_CBC = MediaCodec.CRYPTO_MODE_AES_CBC;
+  public static final int CRYPTO_MODE_AES_CBC = 0x2;
 
   /**
    * Represents an unset {@link android.media.AudioTrack} session identifier. Equal to
    * {@link AudioManager#AUDIO_SESSION_ID_GENERATE}.
    */
   @SuppressWarnings("InlinedApi")
   public static final int AUDIO_SESSION_ID_UNSET = AudioManager.AUDIO_SESSION_ID_GENERATE;