Upstream Android V8 change.

tools/gyp/v8.gyp

 # Copyright 2011 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
 #       with the distribution.
 #     * Neither the name of Google Inc. nor the names of its
 #       contributors may be used to endorse or promote products derived
 #       from this software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 {
   'includes': ['../../build/common.gypi'],
+  'target_conditions': [

[Jakob Kummerow, 2011/11/03 08:30:56]

Note that these settings will not be applied to d8, cctest and any other targets
not defined in this file. If you want to build those for Android, too, please
move this target_condition to ../../build/common.gypi.

[Jing Zhao, 2011/11/03 15:53:36]

I think that's a good idea because we'll want to build many things for Android.
I'll do that. Thanks.

+    ['OS=="android" and _toolset=="target"', {
+      'link_settings': {
+        'libraries': [
+          '-llog',
+        ],
+      }
+    }],
+  ],
   'conditions': [
     ['use_system_v8==0', {
       'targets': [
         {
           'target_name': 'v8',
           'conditions': [
             ['want_separate_host_toolset==1', {
               'toolsets': ['host', 'target'],
             }, {
               'toolsets': ['target'],
@@ skipping 562 matching lines @@
                 'conditions': [
                   ['host_os=="mac" and _toolset!="target"', {
                     'sources': [
                       '../../src/platform-macos.cc'
                     ]
                   }, {
                     'sources': [
                       '../../src/platform-linux.cc'
                     ]
                   }],
-                  ['_toolset=="target"', {
-                    'link_settings': {
-                      'libraries': [
-                        '-llog',
-                       ],
-                     }
-                  }],
                 ],
               },
             ],
             ['OS=="freebsd"', {
                 'link_settings': {
                   'libraries': [
                     '-L/usr/local/lib -lexecinfo',
                 ]},
                 'sources': [
                   '../../src/platform-freebsd.cc',
@@ skipping 107 matching lines @@
                 '<(v8_compress_startup_data)',
                 '<@(experimental_library_files)'
               ],
             },
           ],
         },
         {
           'target_name': 'mksnapshot',
           'type': 'executable',
           'dependencies': [
+            'v8_base',

[Jakob Kummerow, 2011/11/03 08:30:56]

Since v8_nosnapshot depends on v8_base anyway, I don't see why this addition is
necessary.

[Søren Gjesse, 2011/11/03 11:45:13]

As far as I remember this is a workaround for a GYP issue where the linker
grouping on Linux is does not happen without this. Maybe it is only for the
patched version of GYP used by Android.

[Jing Zhao, 2011/11/03 15:53:36]

When building for Linux, the linking command line was like:
  g++ -pthread -Wl,-z,noexecstack  -o out/Debug/mksnapshot -Wl,--start-group
out/Debug/obj.host/mksnapshot/v8/src/mksnapshot.o
out/Debug/obj.host/v8/tools/gyp/libv8_nosnapshot.a
out/Debug/obj.host/v8/tools/gyp/libv8_base.a -Wl,--end-group 

When building for Android, the linking command line was like:
  g++ -pthread -m32  -o out/Release/mksnapshot
out/Release/obj.host/mksnapshot/v8/src/mksnapshot.o
out/Release/obj.host/v8/tools/gyp/libv8_nosnapshot.a
out/Release/obj.host/v8/tools/gyp/libv8_base.a

The second one doesn't have "start-group" and "end-group" so it failed. Adding
v8_base in dependencies makes libv8_base.a come before libv8_nosnapshot.a, and
then it can succeed.

I don't know what happened to gyp, though. I run android_gyp to generate
makefiles, as defined in build/android/envsetup.sh, which passes some DEFINES to
gyp. Is it because "OS=android"?

             'v8_nosnapshot',
           ],
           'include_dirs+': [
             '../../src',
           ],
           'sources': [
             '../../src/mksnapshot.cc',
           ],
           'conditions': [
             ['want_separate_host_toolset==1', {
@@ skipping 127 matching lines @@
             }],
           ],
           'dependencies': [
             'v8'
           ],
         },
       ],
     }],
   ],
 }