Skip to content

Commit

Permalink
Split HLS into a separate module
Browse files Browse the repository at this point in the history
Issue: #2139

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=150643456
  • Loading branch information
ojw28 committed Mar 22, 2017
1 parent a9aca8d commit 25a093b
Show file tree
Hide file tree
Showing 25 changed files with 95 additions and 2 deletions.
3 changes: 2 additions & 1 deletion library/all/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ android {

dependencies {
compile project(':library-core')
compile project(':library-ui')
compile project(':library-hls')
compile project(':library-smoothstreaming')
compile project(':library-ui')
}

android.libraryVariants.all { variant ->
Expand Down
38 changes: 38 additions & 0 deletions library/hls/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// Copyright (C) 2017 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply plugin: 'com.android.library'

android {
compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion

defaultConfig {
minSdkVersion project.ext.minSdkVersion
targetSdkVersion project.ext.targetSdkVersion
}
}

dependencies {
compile project(':library-core')
compile 'com.android.support:support-annotations:25.2.0'
androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
androidTestCompile 'org.mockito:mockito-core:1.9.5'
}

ext {
releaseArtifact = 'exoplayer-hls'
releaseDescription = 'The ExoPlayer library HLS module.'
}
apply from: '../../publish.gradle'
34 changes: 34 additions & 0 deletions library/hls/src/androidTest/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2017 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.google.android.exoplayer2.source.hls.test">

<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="24"/>

<application android:debuggable="true"
android:allowBackup="false"
tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
<uses-library android:name="android.test.runner"/>
</application>

<instrumentation
android:targetPackage="com.google.android.exoplayer2.source.hls.test"
android:name="android.test.InstrumentationTestRunner"
tools:replace="android:targetPackage"/>

</manifest>
17 changes: 17 additions & 0 deletions library/hls/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2017 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<manifest package="com.google.android.exoplayer2.source.hls"/>
3 changes: 2 additions & 1 deletion playbacktests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ android {
}

dependencies {
compile project(':library')
compile project(':library-core')
androidTestCompile project(':library-hls')
}
2 changes: 2 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
// limitations under the License.
include ':library'
include ':library-core'
include ':library-hls'
include ':library-smoothstreaming'
include ':library-ui'
include ':testutils'
Expand All @@ -29,6 +30,7 @@ include ':extension-vp9'

project(':library').projectDir = new File(settingsDir, 'library/all')
project(':library-core').projectDir = new File(settingsDir, 'library/core')
project(':library-hls').projectDir = new File(settingsDir, 'library/hls')
project(':library-smoothstreaming').projectDir = new File(settingsDir, 'library/smoothstreaming')
project(':library-ui').projectDir = new File(settingsDir, 'library/ui')
project(':extension-ffmpeg').projectDir = new File(settingsDir, 'extensions/ffmpeg')
Expand Down

0 comments on commit 25a093b

Please sign in to comment.