Fixes to allow building in an Android tree

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 465 matching lines @@
               'shell/android/java/org/chromium/content_shell/ShellView.java',
             ],
             'jni_headers': [
               '<(SHARED_INTERMEDIATE_DIR)/content/shell/jni/shell_manager_jni.h',
               '<(SHARED_INTERMEDIATE_DIR)/content/shell/jni/shell_view_jni.h',
             ],
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
-          'target_name': 'content_shell_content_view',
+          'target_name': 'libcontent_shell_content_view',

[Yaron, 2012/06/22 18:02:33]

How do you plan to reconcile this with downstream? Seems like we don't need
this. We have slightly different gyp definitions for mmm vs sdk build. Also, I
don't see that we actually had to do this downstream. I do see a copy of the
library to somehwere else.

           'type': 'shared_library',
           'dependencies': [
             'content_shell_jni_headers',
             'content_shell_lib',
             'content_shell_pak',
             # Skia is necessary to ensure the dependencies needed by
             # WebContents are included.
             '../skia/skia.gyp:skia',
             '<(DEPTH)/media/media.gyp:player_android',
           ],
@@ skipping 76 matching lines @@
                 '-buildfile',
                 '<(DEPTH)/content/shell/android/content_shell_apk.xml',
               ]
             }
           ],
         },
       ],
     }],  # OS=="android"
   ]
 }