summaryrefslogtreecommitdiffstats
path: root/testing/android
diff options
context:
space:
mode:
authoryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-10 23:33:38 +0000
committeryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-10 23:33:38 +0000
commit94542cd16235b34fbe46e5ab35109abefc90642c (patch)
treead132023309281e0334e20262706778322a4f560 /testing/android
parenta8fab9af0ce7605d7b4be2c19a88ba8cf4de59db (diff)
downloadchromium_src-94542cd16235b34fbe46e5ab35109abefc90642c.zip
chromium_src-94542cd16235b34fbe46e5ab35109abefc90642c.tar.gz
chromium_src-94542cd16235b34fbe46e5ab35109abefc90642c.tar.bz2
Revert 176198
Fixed permissions on build/android/envsetup.sh > Revert 176176 > > 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 > > TBR=yfriedman@chromium.org > Review URL: https://codereview.chromium.org/11783108 TBR=smckay@chromium.org Review URL: https://codereview.chromium.org/11820065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176202 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing/android')
-rw-r--r--testing/android/AndroidManifest.xml2
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"