From a9d2d08bfb8420d11384884f3a118463f30a8c98 Mon Sep 17 00:00:00 2001
From: "yfriedman@chromium.org"
 <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 10 Jan 2013 22:27:17 +0000
Subject: Update Android build to API level 17 and SDK Tools version 21

Some fixes included:
- Changes to resource management to account for new R.java packaging
  from library projects
  (https://android-review.googlesource.com/#/c/43134/).
- Fixed the package for some inludes in ModalDialogTest.java. This only
  worked because of how we previously used to aggregate all resoures
  from the prior layer. With the new packaging, we must use the resource
  from the appropriate layer.

BUG=163001,166434
NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/11819047

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176176 0039d316-1c4b-4281-b951-d872f2087c98
---
 android_webview/java/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'android_webview/java')

diff --git a/android_webview/java/AndroidManifest.xml b/android_webview/java/AndroidManifest.xml
index c3db376..c5190ee 100644
--- a/android_webview/java/AndroidManifest.xml
+++ b/android_webview/java/AndroidManifest.xml
@@ -20,7 +20,7 @@
     </activity>
 </application>
 
-  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="16" />
+  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.WAKE_LOCK"/>
-- 
cgit v1.1