Roll Android SDK in android_tools repo to api version 16.

Roll Android SDK in android_tools repo to api version 16.

The install-build-deps-android-sdk.sh is no longer necessary, since the SDK is checked out as part of the tree.  It is still useful as an easy way to install the SDK/NDK if we want to use an alternate (i.e. if we explicitly export ANDROID_SDK_ROOT it won't use the tree version).

BUG=


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=150499

[Yaron, 2012-08-04 00:57:51]

https://chromiumcodereview.appspot.com/10823174/diff/1/build/install-build-de...
File build/install-build-deps-android-sdk.sh (left):

https://chromiumcodereview.appspot.com/10823174/diff/1/build/install-build-de...
build/install-build-deps-android-sdk.sh:16:
SDK_FILE_NAME="android-sdk_r${SDK_TARGET_VER}-linux.tgz"
Just remove this file instead (and update build bot script accordingly)

[shashi, 2012-08-04 01:12:00]

Minor nits, we can perhaps do more cleanup here.
lgtm

https://chromiumcodereview.appspot.com/10823174/diff/1/build/install-build-de...
File build/install-build-deps-android-sdk.sh (right):

https://chromiumcodereview.appspot.com/10823174/diff/1/build/install-build-de...
build/install-build-deps-android-sdk.sh:17:
SDK_DOWNLOAD_URL="http://dl.google.com/android/${SDK_FILE_NAME}"
Perhaps we can remove SDK_DOWNLOAD_URL and SDK_MD5SUM.

https://chromiumcodereview.appspot.com/10823174/diff/1/build/install-build-de...
build/install-build-deps-android-sdk.sh:36:
NDK_DOWNLOAD_URL="http://dl.google.com/android/ndk/${NDK_FILE_NAME}"
Same for this.

https://chromiumcodereview.appspot.com/10823174/diff/1/build/install-build-de...
build/install-build-deps-android-sdk.sh:83: echo "Please set ANDROID_SDK_ROOT to
where they should installed to." >& 2
Can we also nuke this code?

[Yaron, 2012-08-06 16:29:04]

http://codereview.chromium.org/10823174/diff/1/build/install-build-deps-andro...
File build/install-build-deps-android-sdk.sh (left):

http://codereview.chromium.org/10823174/diff/1/build/install-build-deps-andro...
build/install-build-deps-android-sdk.sh:16:
SDK_FILE_NAME="android-sdk_r${SDK_TARGET_VER}-linux.tgz"
On 2012/08/04 00:57:51, Yaron wrote:
> Just remove this file instead (and update build bot script accordingly)

Hmm. Although this also installs the custom 64-bit linker. I assume we still
need it so maybe just revert the installation of SDK right now.

[shashi, 2012-08-06 17:28:17]

I missed Yaron's previous comments, makes sense to remove the file. For custom
64 bit linker, can we check it in with the NDK?. This way we do not need even
that bit and it will be much cleaner.

[Yaron, 2012-08-06 17:28:55]

On 2012/08/06 17:28:17, shashi wrote:
> I missed Yaron's previous comments, makes sense to remove the file. For custom
> 64 bit linker, can we check it in with the NDK?. This way we do not need even
> that bit and it will be much cleaner.

Err, good point. sgtm

[navabi, 2012-08-06 18:02:28]

On 2012/08/06 17:28:55, Yaron wrote:
> On 2012/08/06 17:28:17, shashi wrote:
> > I missed Yaron's previous comments, makes sense to remove the file. For
custom
> > 64 bit linker, can we check it in with the NDK?. This way we do not need
even
> > that bit and it will be much cleaner.
> 
> Err, good point. sgtm

The currently checked in NDK already has the 64-bit linker.  I overwrote the
linkers in the NDK with the 64-bit linker.  In a separate CL I will make the
change to use the NDK.

[navabi, 2012-08-06 18:06:36]

PTAL.  Next I'll make the build use the NDK in a separate CL and once I land
those, I will immediately update the chromium.org directions for installing the
SDK/NDK, since the install is no longer required.

[Isaac (away), 2012-08-06 18:11:07]

The install-sdk script is referenced by buildbot_functions.sh and by lots of bb_
scripts.  Look at https://chromiumcodereview.appspot.com/10694048/ for the call
chain.

[Yaron, 2012-08-06 18:12:49]

I think the bots still reference the deleted file so you need to update them

https://chromiumcodereview.appspot.com/10823174/diff/8001/build/android/envse...
File build/android/envsetup_functions.sh (right):

https://chromiumcodereview.appspot.com/10823174/diff/8001/build/android/envse...
build/android/envsetup_functions.sh:230: export ANDROID_SDK_VERSION=15
Seems this should be 16 as well.

[navabi, 2012-08-07 01:17:07]

https://chromiumcodereview.appspot.com/10823174/diff/8001/build/android/envse...
File build/android/envsetup_functions.sh (right):

https://chromiumcodereview.appspot.com/10823174/diff/8001/build/android/envse...
build/android/envsetup_functions.sh:230: export ANDROID_SDK_VERSION=15
On 2012/08/06 18:12:49, Yaron wrote:
> Seems this should be 16 as well.

Since this is copied and pasted between sdk_build_init and non_sdk_build_init I
moved it out into envsetup.sh.

Done.

[Isaac (away), 2012-08-07 03:41:29]

looking good.  spotted a reference to /usr/local/google in envsetup.

https://chromiumcodereview.appspot.com/10823174/diff/10/build/android/buildbo...
File build/android/buildbot_functions.sh (right):

https://chromiumcodereview.appspot.com/10823174/diff/10/build/android/buildbo...
build/android/buildbot_functions.sh:42: function bb_setup_environment {
Does this need to change to third_party/android_tools?  Can we remove this
function entirely?

[Yaron, 2012-08-07 16:10:15]

lgtm

https://chromiumcodereview.appspot.com/10823174/diff/10/build/android/buildbo...
File build/android/buildbot_functions.sh (right):

https://chromiumcodereview.appspot.com/10823174/diff/10/build/android/buildbo...
build/android/buildbot_functions.sh:42: function bb_setup_environment {
On 2012/08/07 03:41:30, Isaac wrote:
> Does this need to change to third_party/android_tools?  Can we remove this
> function entirely?

Can't until we flip to using checked-in NDK.

[Isaac (away), 2012-08-07 17:20:10]

last I heard, we thought the ndk checked into android_tools was invalid.  So
this will remove the bots from downloading their own ndk and at the same time we
cannot just point at the checked in version without pushing the new ndk.

Between the time this is submitted to when ndk is switched, new bots will fail. 
If you check this in, I think you should be ready with an ndk switch over. 
Ideally they would be part of the same patch.

[navabi, 2012-08-07 23:06:28]

On 2012/08/07 17:20:10, Isaac wrote:
> last I heard, we thought the ndk checked into android_tools was invalid.  So
> this will remove the bots from downloading their own ndk and at the same time
we
> cannot just point at the checked in version without pushing the new ndk.
> 
> Between the time this is submitted to when ndk is switched, new bots will
fail. 
> If you check this in, I think you should be ready with an ndk switch over. 
> Ideally they would be part of the same patch.

The ndk checked into android_tools has been fixed (removed the .gitignore
files). The ndk CL is on its way.  I am testing locally right now with building
content shell with the new NDK.  Assuming it works I will submit the CL.

The existing bots will be fine.  My intention is to get this in before any new
bots come up.  If a new bot comes up in the meantime, it will need to install
the ndk manually as we used to do on the bots.

I would prefer not to put them in the same patch, so if the CQ fails we know if
its the SDK or NDK.  I prefer I submit this to the CQ and then the NDK one
immediately after.

[navabi, 2012-08-07 23:49:30]

PTAL.

The DEPS file has been updated to checkout the fixed NDK.  This CL will still
use the downloaded NDK.  The checked in NDK will be used in a separate CL (will
link from this CL once cl has been uploaded).

[Yaron, 2012-08-08 00:04:58]

lgtm

[commit-bot: I haz the power, 2012-08-08 03:08:25]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/navabi@chromium.org/10823174/12003

[navabi, 2012-08-08 03:40:57]

On 2012/08/07 23:49:30, navabi wrote:
> PTAL.
> 
> The DEPS file has been updated to checkout the fixed NDK.  This CL will still
> use the downloaded NDK.  The checked in NDK will be used in a separate CL
(will
> link from this CL once cl has been uploaded).

NDK switch CL: https://chromiumcodereview.appspot.com/10836149/

Try job depends on this CL landing first. It fails now on the install android
sdk script which this CL removes because ANDROID_SDK_ROOT is no longer set
before that script is run.

So Isaac, new bots will break in the current state since they will not set
ANDROID_SDK_ROOT and try to install the SDK.  That should be fixed after this
CL.  And then I will try the NDK one.

[commit-bot: I haz the power, 2012-08-08 04:47:03]

Change committed as 150499