Fix the content_shell.apk in android x86 target build bug

content/content_shell.gypi

Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 4a67c23a1e8b802d195e4f715033a1d240bd4112..f18e1edad723dcda11ea0718c141592da1ffd9da 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -520,6 +520,16 @@
         {
           'target_name': 'content_shell_apk',
           'type': 'none',
+          'variables': {
+            'conditions': [
+              [ 'target_arch == "arm"', {

[John Grabowski, 2012/05/10 15:06:18]

file convention would be more 'target_arch=="ARM"' (no spaces)

[Shouqun Liu, 2012/05/11 02:45:23]

Done.

+                'content_shell_content_view_so%': '<(PRODUCT_DIR)/content_shell/libs/armeabi/libcontent_shell_content_view.so',

[John Grabowski, 2012/05/10 15:06:18]

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?

[Shouqun Liu, 2012/05/11 02:45:23]

yes, agree, use a variable 'android_app_abi' in common.gypi for different arch.
Done.

+              }],
+              [ 'target_arch == "ia32"', {
+                'content_shell_content_view_so%': '<(PRODUCT_DIR)/content_shell/libs/x86/libcontent_shell_content_view.so',
+              }],
+            ],
+          },
           'actions': [
             {
               'action_name': 'copy_base_jar',
@@ -548,7 +558,7 @@
             {
               'action_name': 'copy_and_strip_so',
               'inputs': ['<(SHARED_LIB_DIR)/libcontent_shell_content_view.so'],
-              'outputs': ['<(PRODUCT_DIR)/content_shell/libs/armeabi/libcontent_shell_content_view.so'],
+              'outputs': ['<(content_shell_content_view_so)'],
               'action': [
                 '<!(/bin/echo -n $STRIP)',
                 '--strip-unneeded',  # All symbols not needed for relocation.
@@ -568,7 +578,7 @@
                 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_net.jar',
                 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_media.jar',
                 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_content.jar',
-                '<(PRODUCT_DIR)/content_shell/libs/armeabi/libcontent_shell_content_view.so',
+                '<(content_shell_content_view_so)',
               ],
               'outputs': [
                 # Awkwardly, we build a Debug APK even when gyp is in