diff options
| author | raphael.kubo.da.costa@intel.com <raphael.kubo.da.costa@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-04 23:01:59 +0000 |
|---|---|---|
| committer | raphael.kubo.da.costa@intel.com <raphael.kubo.da.costa@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-04 23:01:59 +0000 |
| commit | 5844a6d9d0645d97676f4ba4f551317cab25f7ce (patch) | |
| tree | 36e469f981499488d0c714b92e1cb7edf436329f /.gitignore | |
| parent | cf1559f00543675039488cd7c62c1eaada336b2e (diff) | |
| download | chromium_src-5844a6d9d0645d97676f4ba4f551317cab25f7ce.zip chromium_src-5844a6d9d0645d97676f4ba4f551317cab25f7ce.tar.gz chromium_src-5844a6d9d0645d97676f4ba4f551317cab25f7ce.tar.bz2 | |
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
Review URL: https://codereview.chromium.org/25675010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227121 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -42,6 +42,7 @@ Thumbs.db v8.log /Makefile /_out +/android_emulator_sdk /arm-sysroot /base/base_unittests_run.xml /breakpad/src/ |