Fix the content_shell.apk in android x86 target build bug

content/content_shell.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'content_shell_product_name': 'Content Shell',
   },
   'targets': [
     {
@@ skipping 502 matching lines @@
             'shell/android/shell_library_loader.h',
             'shell/android/shell_manager.cc',
             'shell/android/shell_manager.h',
             'shell/android/shell_view.cc',
             'shell/android/shell_view.h',
           ],
         },
         {
           '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',
               'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar'],
               'outputs': ['<(PRODUCT_DIR)/content_shell/java/libs/chromium_base.jar'],
               'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
             },
             {
               'action_name': 'copy_net_jar',
               'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_net.jar'],
               'outputs': ['<(PRODUCT_DIR)/content_shell/java/libs/chromium_net.jar'],
               'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
             },
             {
               'action_name': 'copy_media_jar',
               'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_media.jar'],
               'outputs': ['<(PRODUCT_DIR)/content_shell/java/libs/chromium_media.jar'],
               'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
             },
             {
               'action_name': 'copy_content_jar',
               'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_content.jar'],
               'outputs': ['<(PRODUCT_DIR)/content_shell/java/libs/chromium_content.jar'],
               'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
             },
             {
               '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.
                 '<@(_inputs)',
                 '-o',
                 '<@(_outputs)' 
               ],
             },
             {
               'action_name': 'content_shell_apk',
               'inputs': [
                 '<(DEPTH)/content/shell/android/content_shell_apk.xml',
                 '<(DEPTH)/content/shell/android/AndroidManifest.xml',
                 '<!@(find shell/android/java -name "*.java")',
                 '<!@(find shell/android/res -name "*")',
                 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_base.jar',
                 '<(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
                 # Release mode.  I don't think it matters (e.g. we're
                 # probably happy to not codesign) but naming should be
                 # fixed.
                 '<(PRODUCT_DIR)/ContentShell-debug.apk',
               ],
               'action': [
                 'ant',
                 '-DPRODUCT_DIR=<(PRODUCT_DIR)',
                 '-buildfile',
                 '<(DEPTH)/content/shell/android/content_shell_apk.xml',
               ]
             }
           ],
         },
       ],
     }],  # OS=="android"
   ]
 }