android: Use a separate SDK for the emulator again.

android: Use a separate SDK for the emulator again.

Although sharing the SDK with the one downloaded into
src/third_party/android_tools allowed us to avoid having to keep another
660MB SDK around, there were several downsides:

  o It downloaded ARMv7 and x86 system images into the git repository in
    src/third_party/android_tools, potentially confusing users who did
    not have the new directories in their .gitignore.

  o Messages in avd.py and usage of the emulator could lead users to
    update the SDK checked into android_tools/, causing build problems
    and a lot of confusion.

  o The ARMv7 and x86 system images could end up being out of sync with
    the SDK in android_tools/.

  o The SDK in android_tools/ might be older than the one we used to
    download separately.

The new solution is to revert large parts of r222121 and r223003 but not
completely: instead of downloading the SDK into a directory that is two
levels above the top-level src/ (there is no guarantee it is writable,
for example), the emulator SDK is now downloaded into
src/android_emulator_sdk/, which has also been added to .gitignore to
avoid confusion. Additionally, we build upon r222612 and install a newer
version of the SDK that works with version 18 of the Android API.

R=peter@chromium.org,navabi@chromium.org,bulach@chromium.org
BUG=304129
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=227121

[navabi1, 2013-10-04 18:41:47]

Thank you Raphael for this change.

Please make sure the contents of the zipped file ends up in
src/android_emulator_sdk/ instead of the directory that contains subdirs sdk and
eclipse (see comment).

Otherwise, LGTM.

https://codereview.chromium.org/25675010/diff/1/build/android/install_emulato...
File build/android/install_emulator_deps.py (right):

https://codereview.chromium.org/25675010/diff/1/build/android/install_emulato...
build/android/install_emulator_deps.py:81: shutil.move(zip_dir,
constants.EMULATOR_SDK_ROOT)
Won't this move the unzipped directory adt-bundle-linux-...zip into
src/android_emulator_sdk/ so that it looks like this:

src/android_emulator_sdk/adt-linux-bundle-linux/sdk
instead of
src/android_emulator_sdk/sdk

[Raphael Kubo da Costa (rakuco), 2013-10-04 19:04:19]

https://codereview.chromium.org/25675010/diff/1/build/android/install_emulato...
File build/android/install_emulator_deps.py (right):

https://codereview.chromium.org/25675010/diff/1/build/android/install_emulato...
build/android/install_emulator_deps.py:81: shutil.move(zip_dir,
constants.EMULATOR_SDK_ROOT)
On 2013/10/04 18:41:48, navabi1 wrote:
> Won't this move the unzipped directory adt-bundle-linux-...zip into
> src/android_emulator_sdk/ so that it looks like this:
> 
> src/android_emulator_sdk/adt-linux-bundle-linux/sdk
> instead of
> src/android_emulator_sdk/sdk

This function is only called if src/android_emulator does not exist; in this
case, it's similar to calling "mv /tmp/adt-linux-bundle-linux
/path/to/src/android_emulator_sdk", which leaves us with
src/android_emulator_sdk/{eclipse,sdk}.

The implementation is practically identical to the one that existed until
r222120, but I was indeed going to ask on the bug how people handled SDK updates
before: if we want to download a new zip file but the directory already exists,
nothing will be done at all.

[navabi, 2013-10-04 19:11:57]

lgtm

https://codereview.chromium.org/25675010/diff/1/build/android/install_emulato...
File build/android/install_emulator_deps.py (right):

https://codereview.chromium.org/25675010/diff/1/build/android/install_emulato...
build/android/install_emulator_deps.py:81: shutil.move(zip_dir,
constants.EMULATOR_SDK_ROOT)
On 2013/10/04 19:04:19, Raphael Kubo da Costa (rakuco) wrote:
> On 2013/10/04 18:41:48, navabi1 wrote:
> > Won't this move the unzipped directory adt-bundle-linux-...zip into
> > src/android_emulator_sdk/ so that it looks like this:
> > 
> > src/android_emulator_sdk/adt-linux-bundle-linux/sdk
> > instead of
> > src/android_emulator_sdk/sdk
> 
> This function is only called if src/android_emulator does not exist; in this
> case, it's similar to calling "mv /tmp/adt-linux-bundle-linux
> /path/to/src/android_emulator_sdk", which leaves us with
> src/android_emulator_sdk/{eclipse,sdk}.

Ah! Right. That looks good.

> The implementation is practically identical to the one that existed until
> r222120, but I was indeed going to ask on the bug how people handled SDK
updates
> before: if we want to download a new zip file but the directory already
exists,
> nothing will be done at all.

Updates were not handled by this script before. Developer would have to update
the emulator SDK (another reason it was not part of the android_tools sdk). It
would make sense to have the script take a --update or --force option to force
overwriting of the emulator sdk.

[commit-bot: I haz the power, 2013-10-04 20:25:48]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/raphael.kubo.da.costa@intel.com/256750...

[commit-bot: I haz the power, 2013-10-04 23:02:02]

Change committed as 227121