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 559681 02b7afdfa865ec1f93f22dceb005b10115b3194c
parent 559680 1d22a2bb520b06e014539ebdb1e0ad1e21134a9b
child 559682 fcd19e0cce47876f383c3e449071bb81d918055d
child 559684 0dfbb2f45fbc315d093a7d0d20559031b36f223d
push id53164
push userbmo:kikuo@mozilla.com
push dateMon, 10 Apr 2017 11:28:04 +0000
reviewerssebastian
bugs1341990
milestone55.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;