Commit 147d5bb3 by olly Committed by Oliver Woodman

Fix targetSdkVersion to be consistent with gradle builds

The manifest value is always overridden in gradle builds,
so this is for internal builds only. The value should be
the same (i.e. 25!).

Also fix IMA build to force the right support library
version, attempt 2!

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164103183
parent 81cbd734
......@@ -23,7 +23,7 @@
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-feature android:name="android.software.leanback" android:required="false"/>
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="24"/>
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="25"/>
<application
android:label="@string/application_name"
......
......@@ -20,7 +20,7 @@ dependencies {
// |-- com.google.android.gms:play-services-ads-lite:[11.0.2] -> 11.0.2
// |-- com.google.android.gms:play-services-basement:[11.0.2] -> 11.0.2
// |-- com.android.support:support-v4:25.2.0
compile 'com.android.support:support-annotations:' + supportLibraryVersion
compile 'com.android.support:support-v4:' + supportLibraryVersion
compile 'com.google.ads.interactivemedia.v3:interactivemedia:3.7.4'
compile 'com.google.android.gms:play-services-ads:11.0.2'
androidTestCompile project(modulePrefix + 'library')
......
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