diff options
| author | aurimas <aurimas@chromium.org> | 2014-10-21 10:04:58 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-21 17:05:29 +0000 |
| commit | 17d3d93913930fa893c668969f1ccd5b4de746cd (patch) | |
| tree | 4ca0c4d6121bf4243167d2e512e244c573a26409 /android_webview | |
| parent | bfdd053d88166494b126b6f4157bdeb3ee6295cc (diff) | |
| download | chromium_src-17d3d93913930fa893c668969f1ccd5b4de746cd.zip chromium_src-17d3d93913930fa893c668969f1ccd5b4de746cd.tar.gz chromium_src-17d3d93913930fa893c668969f1ccd5b4de746cd.tar.bz2 | |
Update targetSdkVersion for Chromium applications.
Behavior changes described here:
http://developer.android.com/about/versions/android-5.0.html
BUG=424680
TBR=aa@chromium.org
Review URL: https://codereview.chromium.org/664163003
Cr-Commit-Position: refs/heads/master@{#300506}
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/javatests/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | android_webview/test/shell/AndroidManifest.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/android_webview/javatests/AndroidManifest.xml b/android_webview/javatests/AndroidManifest.xml index a681e25..8005cd1 100644 --- a/android_webview/javatests/AndroidManifest.xml +++ b/android_webview/javatests/AndroidManifest.xml @@ -11,7 +11,7 @@ <uses-library android:name="android.test.runner" /> </application> <!-- TODO(joth): Change minSdkVersion to 16 when crbug/161864 lands. --> - <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="19" /> + <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" /> <instrumentation android:name="android.test.InstrumentationTestRunner" android:targetPackage="org.chromium.android_webview.shell" android:label="Tests for org.chromium.android_webview"/> diff --git a/android_webview/test/shell/AndroidManifest.xml b/android_webview/test/shell/AndroidManifest.xml index 749efaa..6529f36 100644 --- a/android_webview/test/shell/AndroidManifest.xml +++ b/android_webview/test/shell/AndroidManifest.xml @@ -32,7 +32,7 @@ </application> <!-- TODO(joth): Change minSdkVersion to 16 when crbug/161864 lands. --> - <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="19" /> + <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.WAKE_LOCK"/> |