Upstream Android V8 change.

tools/gyp/v8.gyp

Index: tools/gyp/v8.gyp
===================================================================
--- tools/gyp/v8.gyp	(revision 9637)
+++ tools/gyp/v8.gyp	(working copy)
@@ -27,6 +27,15 @@
 
 {
   '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': [
@@ -609,13 +618,6 @@
                       '../../src/platform-linux.cc'
                     ]
                   }],
-                  ['_toolset=="target"', {
-                    'link_settings': {
-                      'libraries': [
-                        '-llog',
-                       ],
-                     }
-                  }],
                 ],
               },
             ],
@@ -743,6 +745,7 @@
           '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+': [