Fix the content_shell.apk in android x86 target build bug

Fix the content_shell.apk in android x86 target build bug, copy the libcontent_shell_content_view.so and gdbserver to the correct position.

BUG=127532
TEST=


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

[Shouqun Liu, 2012-05-10 09:33:02]

Hi John & Ted,  this patch fix some file copy issues in android-x86 build, 
thanks for your review.

[John Grabowski, 2012-05-10 15:06:17]

Overall like but would appreciate a tad more generality.

http://codereview.chromium.org/10388067/diff/1/content/content_shell.gypi
File content/content_shell.gypi (right):

http://codereview.chromium.org/10388067/diff/1/content/content_shell.gypi#new...
content/content_shell.gypi:525: [ 'target_arch == "arm"', {
file convention would be more 'target_arch=="ARM"' (no spaces)

http://codereview.chromium.org/10388067/diff/1/content/content_shell.gypi#new...
content/content_shell.gypi:526: 'content_shell_content_view_so%':
'<(PRODUCT_DIR)/content_shell/libs/armeabi/libcontent_shell_content_view.so',
Might be a bit nicer to have a new variable which is more general, such as
apk_libs_archdir.  Set it to armeabi or x86 somewhere more global (e.g.
common.gypi).  wdyt?

http://codereview.chromium.org/10388067/diff/1/content/shell/android/content_...
File content/shell/android/content_shell_apk.xml (right):

http://codereview.chromium.org/10388067/diff/1/content/shell/android/content_...
content/shell/android/content_shell_apk.xml:63: <if>
Can we generalize this a bit more?  E.g. make conditional on setting a var, then
have an unconditional copy.

[Shouqun Liu, 2012-05-11 02:45:22]

Hi, I have made changes according to your comments, thanks for your review

http://codereview.chromium.org/10388067/diff/1/content/content_shell.gypi
File content/content_shell.gypi (right):

http://codereview.chromium.org/10388067/diff/1/content/content_shell.gypi#new...
content/content_shell.gypi:525: [ 'target_arch == "arm"', {
On 2012/05/10 15:06:18, John Grabowski wrote:
> file convention would be more 'target_arch=="ARM"' (no spaces)

Done.

http://codereview.chromium.org/10388067/diff/1/content/content_shell.gypi#new...
content/content_shell.gypi:526: 'content_shell_content_view_so%':
'<(PRODUCT_DIR)/content_shell/libs/armeabi/libcontent_shell_content_view.so',
On 2012/05/10 15:06:18, John Grabowski wrote:
> Might be a bit nicer to have a new variable which is more general, such as
> apk_libs_archdir.  Set it to armeabi or x86 somewhere more global (e.g.
> common.gypi).  wdyt?
yes, agree, use a variable 'android_app_abi' in common.gypi for different arch.
Done.

http://codereview.chromium.org/10388067/diff/1/content/shell/android/content_...
File content/shell/android/content_shell_apk.xml (right):

http://codereview.chromium.org/10388067/diff/1/content/shell/android/content_...
content/shell/android/content_shell_apk.xml:63: <if>
On 2012/05/10 15:06:18, John Grabowski wrote:
> Can we generalize this a bit more?  E.g. make conditional on setting a var,
then
> have an unconditional copy.
Yes, strongly agree, use the APP_ABI argument passed from ant to handle
different cases. In this xml, add property "target.abi" to read APP_ABI, and
also change todir from "${out.dir}/libs/armeabi" to
"${out.dir}/libs/${target.abi}" .   This property is much general.

[John Grabowski, 2012-05-11 16:12:56]

LGTM

[Ted C, 2012-05-11 16:18:30]

lgtm

[commit-bot: I haz the power, 2012-05-11 16:26:11]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/shouqun.liu@intel.com/10388067/8001

[commit-bot: I haz the power, 2012-05-11 16:26:18]

Presubmit check for 10388067-8001 failed and returned exit status 1.

Running presubmit commit checks ...

** Presubmit Messages **
If this change requires manual test instructions to QA team, add
TEST=[instructions].

** Presubmit ERRORS **
Missing LGTM from an OWNER for files in these directories:
    content

Presubmit checks took 1.3s to calculate.

Was the presubmit check useful? Please send feedback & hate mail to
maruel@chromium.org!

[Shouqun Liu, 2012-05-11 16:45:39]

Hi John,  changes in content, thanks for your review.

[Shouqun Liu, 2012-05-11 16:54:56]

avi (OWNER), content/content_shell.gypi changes

[Shouqun Liu, 2012-05-14 14:06:13]

Hi Avi, this patch contains changes under content, please review, thanks

[commit-bot: I haz the power, 2012-05-16 00:59:11]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/shouqun.liu@intel.com/10388067/8001

[commit-bot: I haz the power, 2012-05-16 00:59:38]

Presubmit check for 10388067-8001 failed and returned exit status 1.

Running presubmit commit checks ...

** Presubmit Messages **
If this change requires manual test instructions to QA team, add
TEST=[instructions].

** Presubmit ERRORS **
Missing LGTM from an OWNER for files in these directories:
    content

Presubmit checks took 1.5s to calculate.

Was the presubmit check useful? Please send feedback & hate mail to
maruel@chromium.org!

[jam, 2012-05-16 05:02:11]

lgtm

[commit-bot: I haz the power, 2012-05-16 05:03:10]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/shouqun.liu@intel.com/10388067/8001

[commit-bot: I haz the power, 2012-05-16 06:18:44]

Change committed as 137370