diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 22:27:17 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 22:27:17 +0000 |
| commit | a9d2d08bfb8420d11384884f3a118463f30a8c98 (patch) | |
| tree | 810b7fbb2c9b3a56a2e5b3a3a78954433df7feec /testing | |
| parent | cef547f75aca3ae9c1065a3c6133f8d1bcabfcdd (diff) | |
| download | chromium_src-a9d2d08bfb8420d11384884f3a118463f30a8c98.zip chromium_src-a9d2d08bfb8420d11384884f3a118463f30a8c98.tar.gz chromium_src-a9d2d08bfb8420d11384884f3a118463f30a8c98.tar.bz2 | |
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
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/android/AndroidManifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/testing/android/AndroidManifest.xml b/testing/android/AndroidManifest.xml index 9a83125..27e4bb7 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="14" /> + <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" /> <application android:label="ChromeNativeTests"> <activity android:name=".ChromeNativeTestActivity" |