Pass android_sdk as a variable to gyp

Pass android_sdk as a variable to gyp

This avoids the need for shell script in the gyp file.


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

[Steve Block, 2012-06-29 12:30:41]

I can resolve the 'ANDROID_BUILD_TOP' case when this merges downstream.

[navabi, 2012-06-29 20:29:52]

lgtm but someone else must approve.

http://codereview.chromium.org/10696047/diff/3003/build/android/envsetup.sh
File build/android/envsetup.sh (right):

http://codereview.chromium.org/10696047/diff/3003/build/android/envsetup.sh#n...
build/android/envsetup.sh:154: "
android_sdk=${ANDROID_SDK_ROOT}/platforms/android-${ANDROID_SDK_VERSION}"
This is fine upstream.  Will not work downstream as the SDK directory structure
is slightly different.

[Steve Block, 2012-07-02 09:23:41]

http://codereview.chromium.org/10696047/diff/3003/build/android/envsetup.sh
File build/android/envsetup.sh (right):

http://codereview.chromium.org/10696047/diff/3003/build/android/envsetup.sh#n...
build/android/envsetup.sh:154: "
android_sdk=${ANDROID_SDK_ROOT}/platforms/android-${ANDROID_SDK_VERSION}"
Right, I'll resolve the 'ANDROID_BUILD_TOP' case when this merges downstream.

[navabi, 2012-07-02 19:27:22]

lgtm

[commit-bot: I haz the power, 2012-07-02 19:28:06]

No LGTM from a valid reviewer yet. Only full committers are accepted.
Even if an LGTM may have been provided, it was from a non-committer or
a lowly provisional committer, _not_ a full super star committer.
See http://www.chromium.org/getting-involved/become-a-committer
Note that this has nothing to do with OWNERS files.

[joth, 2012-07-02 19:58:06]

lgtm

[commit-bot: I haz the power, 2012-07-02 19:59:00]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/steveblock@chromium.org/10696047/3003

[commit-bot: I haz the power, 2012-07-02 21:26:04]

Change committed as 145195

[rwalker, 2012-07-02 22:37:17]

Seems to break these instructions:

http://code.google.com/p/chromium/wiki/AndroidBuildInstructions

[John Grabowski, 2012-07-03 05:56:59]

LGTM

Thanks for paying attention to the small things like this.

[Steve Block, 2012-07-03 09:53:16]

> Seems to break these instructions:
Can you be more specific as to the problem you're seeing.

I tried to walk through them, but 'gclient sync' is currently broken for me.

[rwalker, 2012-07-03 16:39:58]

On 2012/07/03 09:53:16, Steve Block wrote:
> > Seems to break these instructions:
> Can you be more specific as to the problem you're seeing.
> 
> I tried to walk through them, but 'gclient sync' is currently broken for me.

I noted the failure I see in the comments:
http://code.google.com/p/chromium/wiki/AndroidBuildInstructions

gclient sync fails (tries to run gyp) for me too unless I first run
build/android/envsetup.sh

Of course, I can't run envsetup.sh until I've sync'd it, so there's a bit of a
chicken and egg problem...

[joth, 2012-07-03 17:14:40]

chromium on Linux has the same boot strap issue (
http://code.google.com/p/chromium/wiki/UsingNewGit#Initial_checkout -- "Do
this to boot strap dependencies on Linux"...)

the same solution should work here for very first checkout:

gclient sync --nohooks


. build/android/envsetup.sh


gclient sync




On 3 July 2012 09:39, <rwalker@codeaurora.org> wrote:

> On 2012/07/03 09:53:16, Steve Block wrote:
>
>> > Seems to break these instructions:
>> Can you be more specific as to the problem you're seeing.
>>
>
>  I tried to walk through them, but 'gclient sync' is currently broken for
>> me.
>>
>
> I noted the failure I see in the comments:
>
http://code.google.com/p/**chromium/wiki/**AndroidBuildInstructions<http://co...
>
> gclient sync fails (tries to run gyp) for me too unless I first run
> build/android/envsetup.sh
>
> Of course, I can't run envsetup.sh until I've sync'd it, so there's a bit
> of a
> chicken and egg problem...
>
>
http://codereview.chromium.**org/10696047/<http://codereview.chromium.org/106...
>

[Steve Block, 2012-07-04 15:19:33]

Got it, I see what you mean. In fact, this problem existed before my change,
only it didn't manifest itself as an error from gclient sync.

I've updated the documentation.