      # Putting a variables dict inside another variables dict looks kind of
      # weird.  This is done so that 'host_arch', 'chromeos', etc are defined as
      # variables within the outer variables dict here.  This is necessary
-@@ -84,6 +96,7 @@
-             # Compute the architecture that we're building on.
-             ['OS=="win" or OS=="mac" or OS=="ios"', {
-               'host_arch%': 'ia32',
-+              'use_openssl%': '0',
-             }, {
-               # This handles the Unix platforms for which there is some support.
-               # Anything else gets passed through, which probably won't work
-@@ -2718,6 +2731,16 @@
+@@ -2718,6 +2730,16 @@
      }],
      ['os_posix==1 and OS!="mac" and OS!="ios"', {
        'target_defaults': {

         # Enable -Werror by default, but put it in a variable so it can
         # be disabled in ~/.gyp/include.gypi on the valgrind builders.
         'variables': {
@@ -3810,7 +3833,7 @@
           'GCC_OBJC_CALL_CXX_CDTORS': 'YES',        # -fobjc-call-cxx-cdtors
           'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',      # -fvisibility=hidden
           'GCC_THREADSAFE_STATICS': 'NO',           # -fno-threadsafe-statics

           'GCC_VERSION': '4.2',
           'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES',  # -Wnewline-eof
           'USE_HEADERMAP': 'NO',
@@ -4015,6 +4037,13 @@
           ],
         },
         'target_conditions': [
