Build with API level 18 on Android.

BUG=294699

Review URL: https://codereview.chromium.org/23604064

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226343 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 10 insertions, 10 deletions

diff --git a/android_webview/javatests/AndroidManifest.xml b/android_webview/javatests/AndroidManifest.xml
index f236d4d..54050c3 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="17" />
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="18" />
     <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 f656a55..69ffb2a 100644
--- a/android_webview/test/shell/AndroidManifest.xml
+++ b/android_webview/test/shell/AndroidManifest.xml
@@ -30,7 +30,7 @@
   </application>
 
   <!-- TODO(joth): Change minSdkVersion to 16 when crbug/161864 lands. -->
-  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" />
+  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="18" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.WAKE_LOCK"/>
diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh
index 2777d2d..b0bdb2a 100755
--- a/build/android/envsetup_functions.sh
+++ b/build/android/envsetup_functions.sh
@@ -279,7 +279,7 @@ ${ANDROID_SDK_BUILD_TOOLS_VERSION}"
 #############################################################################
 webview_build_init() {
   # Use the latest API in the AOSP prebuilts directory (change with AOSP roll).
-  export ANDROID_SDK_VERSION=17
+  export ANDROID_SDK_VERSION=18
 
   # For the WebView build we always use the NDK and SDK in the Android tree,
   # and we don't touch ANDROID_TOOLCHAIN which is already set by Android.
diff --git a/chrome/android/testshell/java/AndroidManifest.xml b/chrome/android/testshell/java/AndroidManifest.xml
index edbada9..71f6b00 100644
--- a/chrome/android/testshell/java/AndroidManifest.xml
+++ b/chrome/android/testshell/java/AndroidManifest.xml
@@ -9,7 +9,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.chromium.chrome.testshell">
 
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" />
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="18" />
     <permission android:name="org.chromium.chrome.testshell.permission.SANDBOX"
             android:protectionLevel="signature" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
diff --git a/chrome/android/testshell/javatests/AndroidManifest.xml b/chrome/android/testshell/javatests/AndroidManifest.xml
index 40927d6..5a9adb6 100644
--- a/chrome/android/testshell/javatests/AndroidManifest.xml
+++ b/chrome/android/testshell/javatests/AndroidManifest.xml
@@ -12,7 +12,7 @@
     <application>
         <uses-library android:name="android.test.runner" />
     </application>
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" />
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="18" />
     <instrumentation android:name="android.test.InstrumentationTestRunner"
         android:targetPackage="org.chromium.chrome.testshell"
         android:label="Tests for org.chromium.chrome.testshell"/>
diff --git a/content/shell/android/browsertests_apk/AndroidManifest.xml b/content/shell/android/browsertests_apk/AndroidManifest.xml
index 9f9f8a1..2d0620c 100644
--- a/content/shell/android/browsertests_apk/AndroidManifest.xml
+++ b/content/shell/android/browsertests_apk/AndroidManifest.xml
@@ -96,7 +96,7 @@
                  android:exported="false" />
     </application>
 
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" />
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="18" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.CAMERA" />
diff --git a/content/shell/android/javatests/AndroidManifest.xml b/content/shell/android/javatests/AndroidManifest.xml
index 3f27e60..099800c 100644
--- a/content/shell/android/javatests/AndroidManifest.xml
+++ b/content/shell/android/javatests/AndroidManifest.xml
@@ -12,7 +12,7 @@
     <application>
         <uses-library android:name="android.test.runner" />
     </application>
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" />
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="18" />
     <instrumentation android:name="android.test.InstrumentationTestRunner"
         android:targetPackage="org.chromium.content_shell_apk"
         android:label="Tests for org.chromium.content_shell_apk"/>
diff --git a/content/shell/android/shell_apk/AndroidManifest.xml b/content/shell/android/shell_apk/AndroidManifest.xml
index 383c7d0..db8f877 100644
--- a/content/shell/android/shell_apk/AndroidManifest.xml
+++ b/content/shell/android/shell_apk/AndroidManifest.xml
@@ -97,7 +97,7 @@
                  android:exported="false" />
     </application>
 
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" />
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="18" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.CAMERA"/>
diff --git a/testing/android/AndroidManifest.xml b/testing/android/AndroidManifest.xml
index a1afb56..1ee1845 100644
--- a/testing/android/AndroidManifest.xml
+++ b/testing/android/AndroidManifest.xml
@@ -10,7 +10,7 @@ found in the LICENSE file.
       android:versionCode="1"
       android:versionName="1.0">
 
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" />
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="18" />
 
     <application android:label="ChromeNativeTests"
             android:name="org.chromium.base.ChromiumApplication">
@@ -31,4 +31,4 @@ found in the LICENSE file.
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
-</manifest> 
+</manifest>