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.
[email protected],[email protected],[email protected]
BUG=304129
Review URL: https://codereview.chromium.org/25675010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227121 0039d316-1c4b-4281-b951-d872f2087c98
5 files changed
