Update emulator to work with version 18 of Android API.

Update emulator to work with version 18 of Android API.

Downloads correct dependencies and updates the paths in avd config.

BUG=249712
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=222612

[navabi, 2013-09-11 01:28:13]

LGTM. Thanks Maria!

[commit-bot: I haz the power, 2013-09-11 01:34:36]

No LGTM from a valid reviewer yet. Only full committers are accepted.
Even if an LGTM may have been provided, it was from a non-committer or
a lowly provisional committer, _not_ a full super star committer.
See http://www.chromium.org/getting-involved/become-a-committer
Note that this has nothing to do with OWNERS files.

[nyquist, 2013-09-11 01:38:19]

rubberstamp lgtm

[commit-bot: I haz the power, 2013-09-11 01:45:01]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mariakhomenko@chromium.org/23475032/1

[commit-bot: I haz the power, 2013-09-11 01:45:08]

Failed to apply patch for build/android/install_emulator_deps.py:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file build/android/install_emulator_deps.py
  Hunk #1 FAILED at 21.
  1 out of 1 hunk FAILED -- saving rejects to file
build/android/install_emulator_deps.py.rej

Patch:       build/android/install_emulator_deps.py
Index: build/android/install_emulator_deps.py
diff --git a/build/android/install_emulator_deps.py
b/build/android/install_emulator_deps.py
index
7b122236266a3683319ae1810880431c5e869b7e..32c16a9d3142eb20e60b96ee048dd456565c1123
100755
--- a/build/android/install_emulator_deps.py
+++ b/build/android/install_emulator_deps.py
@@ -21,11 +21,11 @@ from pylib.utils import run_tests_helper
 
 # From the Android Developer's website.
 SDK_BASE_URL = 'http://dl.google.com/android/adt'
-SDK_ZIP = 'adt-bundle-linux-x86_64-20130522.zip'
+SDK_ZIP = 'adt-bundle-linux-x86_64-20130729.zip'
 
 # Android x86 system image from the Intel website:
 #
http://software.intel.com/en-us/articles/intel-eula-x86-android-4-2-jelly-bea...
-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

[Maria, 2013-09-11 02:20:54]

Marcus, I am adding you to this because it conflicts with CL
https://chromiumcodereview.appspot.com/23621025/ which you reviewed.

I sent a separate email out about that, just adding you here for an FYI.

[bulach, 2013-09-11 12:29:16]

lgtm, makes sense if we want to have extra emulator.. thanks! 

I didn't know about this, that's why I lgtm'd raphael's patch since it was a
good simplification for what seemed dead code.

sorry about the churn.

[Raphael Kubo da Costa (rakuco), 2013-09-11 14:18:23]

Sorry about any breakage. The patch is not going to apply anymore, as GetSDK()
was completely removed in r222121. The idea is to use the SDK that is already
checked out in src/third_party/android_tools/sdk, and
https://codereview.chromium.org/23513022/ should then make the X86 image be
downloaded to the right location there.

[Maria, 2013-09-11 17:00:03]

On 2013/09/11 14:18:23, Raphael Kubo da Costa (rakuco) wrote:
> Sorry about any breakage. The patch is not going to apply anymore, as GetSDK()
> was completely removed in r222121. The idea is to use the SDK that is already
> checked out in src/third_party/android_tools/sdk, and
> https://codereview.chromium.org/23513022/ should then make the X86 image be
> downloaded to the right location there.

Thanks for letting me know. I resolved the merge conflict and will submit this
since
we still need to update to x86 v18 image.

[commit-bot: I haz the power, 2013-09-11 17:01:08]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mariakhomenko@chromium.org/23475032/12001

[commit-bot: I haz the power, 2013-09-11 20:07:17]

Change committed as 222612