[Android] Upstream additional changes from envsetup.

[Android] Upstream additional changes from envsetup.

Splits helper functions out of envsetup into envsetup_functions.sh.
Also includes device helper functions in
build/android/adb_device_functions.sh.

Finally, some fixes to build/common.gypi that happened when
cherry-picked down https://chromiumcodereview.appspot.com/10807019

BUG=137569, 136693
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=148377

[Yaron, 2012-07-24 02:01:41]

steve/jrg: everything
james: can you try this on x86 and let me know if I missed something.

This'll bring upstream mostly in line with our forked envsetup. Torne's going to
work on widdling this down and moving more of the config to gyp.

[Yaron, 2012-07-24 02:04:26]

I'm aware that webview_build_init is incomplete as I'm not including
all_android_webview.gyp but I think it's fine as it's not really functional yet.
Hopefully you can pick that up later, Steve/Torne?

[Wei James(wistoch), 2012-07-24 05:19:07]

https://chromiumcodereview.appspot.com/10796104/diff/1/build/android/envsetup...
File build/android/envsetup_functions.sh (right):

https://chromiumcodereview.appspot.com/10796104/diff/1/build/android/envsetup...
build/android/envsetup_functions.sh:38: "/prebuilt/${toolchain_dir}/bin/"
script error in line 35 and 37 with line wrapping.

$ . build/android/envsetup.sh --sdk
Using SDK build
arm-linux-androideabi-4.4.3: command not found
bash: /prebuilt/linux-x86/bin/: No such file or directory

$ export TARGET_PRODUCT=x86
$ . build/android/envsetup.sh --sdk
Using SDK build
x86-4.4.3: command not found
bash: /prebuilt/linux-x86/bin/: No such file or directory

[Isaac (away), 2012-07-24 05:23:39]

https://chromiumcodereview.appspot.com/10796104/diff/1/build/android/envsetup...
File build/android/envsetup_functions.sh (right):

https://chromiumcodereview.appspot.com/10796104/diff/1/build/android/envsetup...
build/android/envsetup_functions.sh:38: "/prebuilt/${toolchain_dir}/bin/"
On 2012/07/24 05:19:07, James Wei wrote:
> script error in line 35 and 37 with line wrapping.
> 
> $ . build/android/envsetup.sh --sdk
> Using SDK build
> arm-linux-androideabi-4.4.3: command not found
> bash: /prebuilt/linux-x86/bin/: No such file or directory
> 
> $ export TARGET_PRODUCT=x86
> $ . build/android/envsetup.sh --sdk
> Using SDK build
> x86-4.4.3: command not found
> bash: /prebuilt/linux-x86/bin/: No such file or directory

Fun part of bash line wrapping: you can't indent subsequent line.

[Torne, 2012-07-24 08:48:14]

On 2012/07/24 02:04:26, Yaron wrote:
> I'm aware that webview_build_init is incomplete as I'm not including
> all_android_webview.gyp but I think it's fine as it's not really functional
yet.
> Hopefully you can pick that up later, Steve/Torne?

That's fine; all_android_webview has been deleted downstream anyway. I'm
producing new gyp files currently and will land them upstream later.

[Steve Block, 2012-07-24 09:51:53]

lgtm

http://codereview.chromium.org/10796104/diff/1/build/android/envsetup_functio...
File build/android/envsetup_functions.sh (right):

http://codereview.chromium.org/10796104/diff/1/build/android/envsetup_functio...
build/android/envsetup_functions.sh:275: "import os.path;\
Space before '\'

http://codereview.chromium.org/10796104/diff/1/build/android/envsetup_functio...
build/android/envsetup_functions.sh:290: export
CHROMIUM_GYP_FILE="${CHROME_SRC}/build/all_android_webview.gyp"
Maybe add a TODO for torne to make clear this file isn't upstream yet.

http://codereview.chromium.org/10796104/diff/1/build/common.gypi
File build/common.gypi (right):

http://codereview.chromium.org/10796104/diff/1/build/common.gypi#newcode911
build/common.gypi:911: 'android_build_type%': '<(android_build_type)',
You can get rid of this

[Yaron, 2012-07-24 15:18:25]

Thanks Isaac and others. Last minute changes for line-wrapping presubmit that I
didn't test enough. I think this is better now. ptal

http://codereview.chromium.org/10796104/diff/1/build/android/envsetup_functio...
File build/android/envsetup_functions.sh (right):

http://codereview.chromium.org/10796104/diff/1/build/android/envsetup_functio...
build/android/envsetup_functions.sh:275: "import os.path;\
On 2012/07/24 09:51:54, Steve Block wrote:
> Space before '\'

Done.

http://codereview.chromium.org/10796104/diff/1/build/android/envsetup_functio...
build/android/envsetup_functions.sh:290: export
CHROMIUM_GYP_FILE="${CHROME_SRC}/build/all_android_webview.gyp"
On 2012/07/24 09:51:54, Steve Block wrote:
> Maybe add a TODO for torne to make clear this file isn't upstream yet.

Done.

http://codereview.chromium.org/10796104/diff/1/build/common.gypi
File build/common.gypi (right):

http://codereview.chromium.org/10796104/diff/1/build/common.gypi#newcode911
build/common.gypi:911: 'android_build_type%': '<(android_build_type)',
On 2012/07/24 09:51:54, Steve Block wrote:
> You can get rid of this

Done.

[John Grabowski, 2012-07-24 18:18:02]

LGTM

[commit-bot: I haz the power, 2012-07-25 17:07:01]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yfriedman@chromium.org/10796104/8001

[commit-bot: I haz the power, 2012-07-25 17:07:06]

Failed to apply patch for build/common.gypi:
While running patch -p1 --forward --force;
patching file build/common.gypi
Hunk #4 FAILED at 905.
1 out of 4 hunks FAILED -- saving rejects to file build/common.gypi.rej

[commit-bot: I haz the power, 2012-07-25 17:44:37]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yfriedman@chromium.org/10796104/12001

[commit-bot: I haz the power, 2012-07-25 19:15:05]

Change committed as 148377