Commit ce55d1a7 by olly Committed by Oliver Woodman

Modularize ExoPlayer steps 1 + 2.

1. Move entire library from v2/library/ to v2/library/core
2. Add v2/library/all that depends on v2/library/core

Issue: #2139

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=150455693
parent f2de393d
Showing with 64 additions and 30 deletions

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -29,7 +29,7 @@ android {
}
dependencies {
compile project(':library')
compile project(':library-core')
compile files('libs/cronet_api.jar')
compile files('libs/cronet_impl_common_java.jar')
compile files('libs/cronet_impl_native_java.jar')
......
......@@ -30,5 +30,5 @@ android {
}
dependencies {
compile project(':library')
compile project(':library-core')
}
......@@ -30,7 +30,7 @@ android {
}
dependencies {
compile project(':library')
compile project(':library-core')
androidTestCompile project(':testutils')
}
......@@ -24,7 +24,7 @@ android {
}
dependencies {
compile project(':library')
compile project(':library-core')
compile 'com.google.vr:sdk-audio:1.30.0'
}
......
......@@ -29,7 +29,7 @@ android {
}
dependencies {
compile project(':library')
compile project(':library-core')
compile('com.squareup.okhttp3:okhttp:3.6.0') {
exclude group: 'org.json'
}
......
......@@ -30,5 +30,5 @@ android {
}
dependencies {
compile project(':library')
compile project(':library-core')
}
......@@ -30,6 +30,6 @@ android {
}
dependencies {
compile project(':library')
compile project(':library-core')
}
......@@ -22,29 +22,11 @@ android {
defaultConfig {
minSdkVersion project.ext.minSdkVersion
targetSdkVersion project.ext.targetSdkVersion
consumerProguardFiles 'proguard-rules.txt'
}
buildTypes {
// Re-enable test coverage when the following issue is fixed:
// https://code.google.com/p/android/issues/detail?id=226070
// debug {
// testCoverageEnabled = true
// }
}
sourceSets {
androidTest {
java.srcDirs += "../testutils/src/main/java/"
}
}
}
dependencies {
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'
compile project(':library-core')
}
android.libraryVariants.all { variant ->
......@@ -82,6 +64,6 @@ android.libraryVariants.all { variant ->
ext {
releaseArtifact = 'exoplayer'
releaseDescription = 'The ExoPlayer library.'
releaseDescription = 'The ExoPlayer library (all modules).'
}
apply from: '../publish.gradle'
apply from: '../../publish.gradle'
// Copyright (C) 2016 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
consumerProguardFiles 'proguard-rules.txt'
}
buildTypes {
// Re-enable test coverage when the following issue is fixed:
// https://code.google.com/p/android/issues/detail?id=226070
// debug {
// testCoverageEnabled = true
// }
}
sourceSets {
androidTest {
java.srcDirs += "../../testutils/src/main/java/"
}
}
}
dependencies {
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-core'
releaseDescription = 'The ExoPlayer library core module.'
}
apply from: '../../publish.gradle'
......@@ -16,7 +16,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.google.android.exoplayer2.test">
package="com.google.android.exoplayer2.core.test">
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="24"/>
......@@ -27,7 +27,7 @@
</application>
<instrumentation
android:targetPackage="com.google.android.exoplayer2.test"
android:targetPackage="com.google.android.exoplayer2.core.test"
android:name="android.test.InstrumentationTestRunner"
tools:replace="android:targetPackage"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment