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

build/common.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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 771 matching lines @@
         'enable_web_intents%': 0,
         'java_bridge%': 1,
         # Android does not support themes.
         'enable_themes%': 0,
 
         # Set to 1 once we have a notification system for Android.
         # http://crbug.com/115320
         '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',
 
         # Always use the chromium skia. The use_system_harfbuzz needs to
         # match use_system_skia.
         'use_system_skia%': '0',
         'use_system_harfbuzz%': '0',
 
         # Use the system icu.
@@ skipping 1544 matching lines @@
                 'libraries': [
                   # crtend_android.o needs to be the last item in libraries.
                   # Do not add any libraries after this!
                   '<(android_ndk_lib)/crtend_android.o',
                 ],
               }],
               ['_type=="shared_library"', {
                 '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' ],
               }],
             ],
           }],
           # Settings for building host targets using the system toolchain.
           ['_toolset=="host"', {
             'cflags!': [
               # Due to issues in Clang build system, using ASan on 32-bit
               # binaries on x86_64 host is problematic.
               # TODO(eugenis): re-enable.
               '-faddress-sanitizer',
@@ skipping 574 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }