From d8382dc54b33fc020edd148fddb3979953c40ef6 Mon Sep 17 00:00:00 2001 From: "mariakhomenko@chromium.org" Date: Wed, 11 Sep 2013 20:07:11 +0000 Subject: [PATCH] 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: http://src.chromium.org/svn/trunk/src/build@222612 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- .../AVD_for_Galaxy_Nexus_by_Google_arm.avd/config.ini | 2 +- .../AVD_for_Galaxy_Nexus_by_Google_x86.avd/config.ini | 2 +- android/install_emulator_deps.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/avd_configs/AVD_for_Galaxy_Nexus_by_Google_arm.avd/config.ini b/android/avd_configs/AVD_for_Galaxy_Nexus_by_Google_arm.avd/config.ini index 0b2f97233..9e0ad8080 100644 --- a/android/avd_configs/AVD_for_Galaxy_Nexus_by_Google_arm.avd/config.ini +++ b/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/android/avd_configs/AVD_for_Galaxy_Nexus_by_Google_x86.avd/config.ini b/android/avd_configs/AVD_for_Galaxy_Nexus_by_Google_x86.avd/config.ini index 567ba78e2..26f7bfe60 100644 --- a/android/avd_configs/AVD_for_Galaxy_Nexus_by_Google_x86.avd/config.ini +++ b/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/android/install_emulator_deps.py b/android/install_emulator_deps.py index 724bb7184..e1dbe0517 100755 --- a/android/install_emulator_deps.py +++ b/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