Revert 128679 - Speculative revert. xcodebuilders hosed between r128678 - 128680 in GYP phse, this …

build/common.gypi

Index: build/common.gypi
===================================================================
--- build/common.gypi	(revision 128684)
+++ build/common.gypi	(working copy)
@@ -789,9 +789,9 @@
         'notifications%': 0,
 
         # Builds the gtest targets as a shared_library.
-        # TODO(jrg): when 'gtest_target_type'=='shared_libary' and OS==android, 
-        # make all gtest_targets depend on base/base.gyp:native_test_apk.
-        ### 'gtest_target_type': 'shared_libary',
+        # TODO(michaelbai): Use the fixed value 'shared_library' once it
+        # is fully supported.
+        'gtest_target_type%': '<(gtest_target_type)',
 
         # Uses system APIs for decoding audio and video.
         'use_libffmpeg%': '0',
@@ -2356,11 +2356,6 @@
                 'ldflags': [
                   '-Wl,-shared,-Bsymbolic',
                 ],
-                # Use of -nostdlib prevents the compiler from bringing
-                # in crtbegin_dynamic.o et al, so we get an undefined
-                # reference to ___dso_handle when building
-                # gtest_target_type==shared_library.
-                'ldflags!': [ '-nostdlib' ],
               }],
             ],
           }],