diff options
| author | smckay@chromium.org <smckay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 23:18:11 +0000 |
|---|---|---|
| committer | smckay@chromium.org <smckay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 23:18:11 +0000 |
| commit | 6160112beb92fa89d47236c149b0fe9c48676d5e (patch) | |
| tree | cc975a2d5e4ab8be7a520312fece8fa59dd118a8 /testing | |
| parent | ee49695d22fe52592053e393da9836e80b9a3346 (diff) | |
| download | chromium_src-6160112beb92fa89d47236c149b0fe9c48676d5e.zip chromium_src-6160112beb92fa89d47236c149b0fe9c48676d5e.tar.gz chromium_src-6160112beb92fa89d47236c149b0fe9c48676d5e.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176198 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 27e4bb7..9a83125 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="14" /> <application android:label="ChromeNativeTests"> <activity android:name=".ChromeNativeTestActivity" |