diff options
| author | mariakhomenko@chromium.org <mariakhomenko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-11 20:07:11 +0000 |
|---|---|---|
| committer | mariakhomenko@chromium.org <mariakhomenko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-11 20:07:11 +0000 |
| commit | f66112f51641cd6c637b1cafb22797f742060168 (patch) | |
| tree | d5fa4fa1db5097f02b5b267e16f2d54374c225fe | |
| parent | 8f04c3e912b126efd23900aa2a9d0fa8be91b7c7 (diff) | |
| download | chromium_src-f66112f51641cd6c637b1cafb22797f742060168.zip chromium_src-f66112f51641cd6c637b1cafb22797f742060168.tar.gz chromium_src-f66112f51641cd6c637b1cafb22797f742060168.tar.bz2 | |
Update emulator to work with version 18 of Android API.
Downloads correct dependencies and updates the paths in avd config.
BUG=249712
Review URL: https://chromiumcodereview.appspot.com/23475032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222612 0039d316-1c4b-4281-b951-d872f2087c98
3 files changed, 3 insertions, 3 deletions
diff --git a/build/android/avd_configs/AVD_for_Galaxy_Nexus_by_Google_arm.avd/config.ini b/build/android/avd_configs/AVD_for_Galaxy_Nexus_by_Google_arm.avd/config.ini index 0b2f972..9e0ad80 100644 --- a/build/android/avd_configs/AVD_for_Galaxy_Nexus_by_Google_arm.avd/config.ini +++ b/build/android/avd_configs/AVD_for_Galaxy_Nexus_by_Google_arm.avd/config.ini @@ -22,7 +22,7 @@ hw.trackBall=no hw.device.name=Galaxy Nexus hw.battery=yes hw.sensors.proximity=yes -image.sysdir.1=system-images/android-17/armeabi-v7a/ +image.sysdir.1=system-images/android-18/armeabi-v7a/ hw.sensors.orientation=yes hw.audioInput=yes hw.camera.front=none diff --git a/build/android/avd_configs/AVD_for_Galaxy_Nexus_by_Google_x86.avd/config.ini b/build/android/avd_configs/AVD_for_Galaxy_Nexus_by_Google_x86.avd/config.ini index 567ba78..26f7bfe 100644 --- a/build/android/avd_configs/AVD_for_Galaxy_Nexus_by_Google_x86.avd/config.ini +++ b/build/android/avd_configs/AVD_for_Galaxy_Nexus_by_Google_x86.avd/config.ini @@ -21,7 +21,7 @@ hw.trackBall=no hw.device.name=Galaxy Nexus hw.battery=yes hw.sensors.proximity=yes -image.sysdir.1=system-images/android-17/x86/ +image.sysdir.1=system-images/android-18/x86/ hw.sensors.orientation=yes hw.audioInput=yes hw.camera.front=none diff --git a/build/android/install_emulator_deps.py b/build/android/install_emulator_deps.py index 724bb71..e1dbe05 100755 --- a/build/android/install_emulator_deps.py +++ b/build/android/install_emulator_deps.py @@ -21,7 +21,7 @@ from pylib.utils import run_tests_helper # Android x86 system image from the Intel website: # http://software.intel.com/en-us/articles/intel-eula-x86-android-4-2-jelly-bean-bin -X86_IMG_URL = 'http://download-software.intel.com/sites/landingpage/android/sysimg_x86-17_r01.zip' +X86_IMG_URL = 'http://download-software.intel.com/sites/landingpage/android/sysimg_x86-18_r01.zip' # Android API level API_TARGET = 'android-%s' % constants.ANDROID_SDK_VERSION |