Move android gyp definitions to gyp

Move android gyp definitions to gyp

This removes unneeded gyp defines from envsetup. I still left the environment variables because some scripts (e.g. findbugs) still depend on them. I'll remove those usages and the environment variables separately.

[cjhopman, 2013-01-16 16:25:20]

https://codereview.chromium.org/11886053/diff/4003/build/common.gypi
File build/common.gypi (right):

https://codereview.chromium.org/11886053/diff/4003/build/common.gypi#newcode1089
build/common.gypi:1089: 'android_host_arch%': '<!(uname -m)',
I don't think these need to be in an inner 'variables' scope.

https://codereview.chromium.org/11886053/diff/4003/build/common.gypi#newcode1120
build/common.gypi:1120: 'android_app_abi%': '<(android_app_abi)',
I think android_host_arch, android_sdk_root, and android_sdk_version can all be
defined in this scope (I'd probably keep android_sdk_root by android_ndk_root
since they are so similar, though).

[Yaron, 2013-01-16 16:53:26]

https://codereview.chromium.org/11886053/diff/4003/build/common.gypi
File build/common.gypi (right):

https://codereview.chromium.org/11886053/diff/4003/build/common.gypi#newcode1089
build/common.gypi:1089: 'android_host_arch%': '<!(uname -m)',
On 2013/01/16 16:25:20, cjhopman wrote:
> I don't think these need to be in an inner 'variables' scope.

Seems like they do as it won't gyp without it. It first complains with:

Undefined variable android_host_arch
if I remove it. If I add that back to the variables block, it then complains
about android_ndk_root.

https://codereview.chromium.org/11886053/diff/4003/build/common.gypi#newcode1120
build/common.gypi:1120: 'android_app_abi%': '<(android_app_abi)',
On 2013/01/16 16:25:20, cjhopman wrote:
> I think android_host_arch, android_sdk_root, and android_sdk_version can all
be
> defined in this scope (I'd probably keep android_sdk_root by android_ndk_root
> since they are so similar, though).

1) I wanted to keep android_sdk_root with android_ndk_root as you indicated
2) android_host_arch doesn't really need to be exported (only needed for
android_toolchain)
3) android_sdk_version needs to be in the inner scope too or I get an error on
the android_sdk line below.

[cjhopman, 2013-01-16 16:58:30]

lgtm

[Torne, 2013-01-16 17:26:49]

lgtm

[Yaron, 2013-01-16 17:49:11]

dcommit barfed when updating this patch but it appears to have landed:
http://src.chromium.org/viewvc/chrome?view=rev&revision=177169

[Nico, 2014-02-10 20:28:11]

https://codereview.chromium.org/11886053/diff/4003/build/common.gypi
File build/common.gypi (right):

https://codereview.chromium.org/11886053/diff/4003/build/common.gypi#newcode1087
build/common.gypi:1087: 'android_ndk_root%': '<!(cd <(DEPTH) && pwd
-P)/third_party/android_tools/ndk/',
This moved android_ndk_root% off the ANDROID_NDK_ROOT env var, but didn't change
envsetup to set android_ndk_root in the webview build – as a result, the webview
build uses the ndk in third_party instead of the one from the android build
system after this change, right? Is my understanding correct? Was this intended?

[Yaron, 2014-02-10 21:16:01]

https://codereview.chromium.org/11886053/diff/4003/build/common.gypi
File build/common.gypi (right):

https://codereview.chromium.org/11886053/diff/4003/build/common.gypi#newcode1087
build/common.gypi:1087: 'android_ndk_root%': '<!(cd <(DEPTH) && pwd
-P)/third_party/android_tools/ndk/',
On 2014/02/10 20:28:12, Nico (away Feb 11 - Feb 17) wrote:
> This moved android_ndk_root% off the ANDROID_NDK_ROOT env var, but didn't
change
> envsetup to set android_ndk_root in the webview build – as a result, the
webview
> build uses the ndk in third_party instead of the one from the android build
> system after this change, right? Is my understanding correct? Was this
intended?

I was working on removing these builds from the chrome part and torne was going
to do the webview part. I see what you're saying though. I suspect this must be
handled in a webview build later on as for webview these are used to generate
Android.mk files which are checked in.

torne?

[Torne, 2014-02-11 10:46:11]

On 2014/02/10 21:16:01, Yaron wrote:
> https://codereview.chromium.org/11886053/diff/4003/build/common.gypi
> File build/common.gypi (right):
> 
>
https://codereview.chromium.org/11886053/diff/4003/build/common.gypi#newcode1087
> build/common.gypi:1087: 'android_ndk_root%': '<!(cd <(DEPTH) && pwd
> -P)/third_party/android_tools/ndk/',
> On 2014/02/10 20:28:12, Nico (away Feb 11 - Feb 17) wrote:
> > This moved android_ndk_root% off the ANDROID_NDK_ROOT env var, but didn't
> change
> > envsetup to set android_ndk_root in the webview build – as a result, the
> webview
> > build uses the ndk in third_party instead of the one from the android build
> > system after this change, right? Is my understanding correct? Was this
> intended?
> 
> I was working on removing these builds from the chrome part and torne was
going
> to do the webview part. I see what you're saying though. I suspect this must
be
> handled in a webview build later on as for webview these are used to generate
> Android.mk files which are checked in.
> 
> torne?

I don't think we actually use the NDK at all in a WebView build. Actually, I
thought that the gyp define was set to something intentionally invalid, but it
looks like it's not.

There is no NDK in third_party in the WebView tree (we don't check out
android_tools), also.