From 204537ed40e85134a1c5c91f0dd1e5453775043a Mon Sep 17 00:00:00 2001 From: olly Date: Tue, 14 Mar 2017 03:47:26 -0700 Subject: [PATCH] Pre-modularization cleanup - Use a variable for the (default) minSdkVersion. There will be more modules that need it, and it'll be easier to manage if it's in one place. Issue: #2139 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=150050663 --- build.gradle | 8 +++++--- extensions/cronet/build.gradle | 2 +- extensions/ffmpeg/build.gradle | 2 +- extensions/flac/build.gradle | 2 +- extensions/gvr/build.gradle | 1 - extensions/okhttp/build.gradle | 2 +- extensions/opus/build.gradle | 3 +-- extensions/vp9/build.gradle | 2 +- library/build.gradle | 7 +------ playbacktests/build.gradle | 2 +- testutils/build.gradle | 2 +- 11 files changed, 14 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index 05c58be9ab..e94849fbf1 100644 --- a/build.gradle +++ b/build.gradle @@ -11,9 +11,6 @@ // 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. - -// Top-level build file where you can add configuration options common to all sub-projects/modules. - buildscript { repositories { jcenter() @@ -29,6 +26,11 @@ allprojects { jcenter() } project.ext { + // Important: ExoPlayer specifies a minSdkVersion of 9 because various + // components provided by the library may be of use on older devices. + // However, please note that the core media playback functionality + // provided by the library requires API level 16 or greater. + minSdkVersion=9 compileSdkVersion=25 targetSdkVersion=25 buildToolsVersion='25' diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle index a245133937..f031a9dc48 100644 --- a/extensions/cronet/build.gradle +++ b/extensions/cronet/build.gradle @@ -18,7 +18,7 @@ android { buildToolsVersion project.ext.buildToolsVersion defaultConfig { - minSdkVersion 9 + minSdkVersion project.ext.minSdkVersion targetSdkVersion project.ext.targetSdkVersion testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } diff --git a/extensions/ffmpeg/build.gradle b/extensions/ffmpeg/build.gradle index e0f6d900a0..a6523788cb 100644 --- a/extensions/ffmpeg/build.gradle +++ b/extensions/ffmpeg/build.gradle @@ -18,7 +18,7 @@ android { buildToolsVersion project.ext.buildToolsVersion defaultConfig { - minSdkVersion 9 + minSdkVersion project.ext.minSdkVersion targetSdkVersion project.ext.targetSdkVersion consumerProguardFiles 'proguard-rules.txt' } diff --git a/extensions/flac/build.gradle b/extensions/flac/build.gradle index 7f1a790dad..1c23b9987c 100644 --- a/extensions/flac/build.gradle +++ b/extensions/flac/build.gradle @@ -18,7 +18,7 @@ android { buildToolsVersion project.ext.buildToolsVersion defaultConfig { - minSdkVersion 9 + minSdkVersion project.ext.minSdkVersion targetSdkVersion project.ext.targetSdkVersion consumerProguardFiles 'proguard-rules.txt' } diff --git a/extensions/gvr/build.gradle b/extensions/gvr/build.gradle index 278d1c248b..320397656e 100644 --- a/extensions/gvr/build.gradle +++ b/extensions/gvr/build.gradle @@ -18,7 +18,6 @@ android { buildToolsVersion project.ext.buildToolsVersion defaultConfig { - // Required by com.google.vr:sdk-audio. minSdkVersion 19 targetSdkVersion project.ext.targetSdkVersion } diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle index f1f9956027..f4cdfdb853 100644 --- a/extensions/okhttp/build.gradle +++ b/extensions/okhttp/build.gradle @@ -19,7 +19,7 @@ android { buildToolsVersion project.ext.buildToolsVersion defaultConfig { - minSdkVersion 9 + minSdkVersion project.ext.minSdkVersion targetSdkVersion project.ext.targetSdkVersion } } diff --git a/extensions/opus/build.gradle b/extensions/opus/build.gradle index d354654c14..a6523788cb 100644 --- a/extensions/opus/build.gradle +++ b/extensions/opus/build.gradle @@ -18,7 +18,7 @@ android { buildToolsVersion project.ext.buildToolsVersion defaultConfig { - minSdkVersion 9 + minSdkVersion project.ext.minSdkVersion targetSdkVersion project.ext.targetSdkVersion consumerProguardFiles 'proguard-rules.txt' } @@ -32,4 +32,3 @@ android { dependencies { compile project(':library') } - diff --git a/extensions/vp9/build.gradle b/extensions/vp9/build.gradle index d354654c14..91d80f4970 100644 --- a/extensions/vp9/build.gradle +++ b/extensions/vp9/build.gradle @@ -18,7 +18,7 @@ android { buildToolsVersion project.ext.buildToolsVersion defaultConfig { - minSdkVersion 9 + minSdkVersion project.ext.minSdkVersion targetSdkVersion project.ext.targetSdkVersion consumerProguardFiles 'proguard-rules.txt' } diff --git a/library/build.gradle b/library/build.gradle index 3a821fdc3d..0ad54aadb2 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -21,12 +21,7 @@ android { buildToolsVersion project.ext.buildToolsVersion defaultConfig { - // Important: ExoPlayerLib specifies a minSdkVersion of 9 because - // various components provided by the library may be of use on older - // devices. However, please note that the core video playback - // functionality provided by the library requires API level 16 or - // greater. - minSdkVersion 9 + minSdkVersion project.ext.minSdkVersion targetSdkVersion project.ext.targetSdkVersion consumerProguardFiles 'proguard-rules.txt' } diff --git a/playbacktests/build.gradle b/playbacktests/build.gradle index c53793b534..cb82d0a466 100644 --- a/playbacktests/build.gradle +++ b/playbacktests/build.gradle @@ -18,7 +18,7 @@ android { buildToolsVersion project.ext.buildToolsVersion defaultConfig { - minSdkVersion 9 + minSdkVersion project.ext.minSdkVersion targetSdkVersion project.ext.targetSdkVersion } } diff --git a/testutils/build.gradle b/testutils/build.gradle index 83ff065f9a..a97c743384 100644 --- a/testutils/build.gradle +++ b/testutils/build.gradle @@ -18,7 +18,7 @@ android { buildToolsVersion project.ext.buildToolsVersion defaultConfig { - minSdkVersion 9 + minSdkVersion project.ext.minSdkVersion targetSdkVersion project.ext.targetSdkVersion } }