Revert of [build] Fix default for target_arch (patchset #1 id:1 of...

Revert of [build] Fix default for target_arch (patchset #1 id:1 of https://codereview.chromium.org/2040803005/ )

Reason for revert:
sysroot logic breaks "make arm"

Original issue's description:
> [build] Fix default for target_arch
>
> Fix after https://codereview.chromium.org/2028623002/
>
> BUG=chromium:474921, chromium:616032
> TBR=vogelheim@chromium.org, jochen@chromium.org
> NOTRY=true
>
> Committed: https://crrev.com/9dcb67dd174fefc98f9c964ef54fed8fe6feb224
> Cr-Commit-Position: refs/heads/master@{#36733}

TBR=vogelheim@chromium.org,jochen@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:474921, chromium:616032

Review-Url: https://codereview.chromium.org/2039853002
Cr-Commit-Position: refs/heads/master@{#36740}

gypfiles/standalone.gypi

@@ -49,24 +49,20 @@
     'variables': {
       'variables': {
         'variables': {
-          'variables': {
-            'conditions': [
-              ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or \
-                 OS=="netbsd" or OS=="mac" or OS=="qnx" or OS=="aix"', {
-                # This handles the Unix platforms we generally deal with.
-                # Anything else gets passed through, which probably won't work
-                # very well; such hosts should pass an explicit target_arch
-                # to gyp.
-                'host_arch%': '<!pymod_do_main(detect_v8_host_arch)',
-              }, {
-                # OS!="linux" and OS!="freebsd" and OS!="openbsd" and
-                # OS!="netbsd" and OS!="mac" and OS!="aix"
-                'host_arch%': 'ia32',
-              }],
-            ],
-          },
-          'host_arch%': '<(host_arch)',
-          'target_arch%': '<(host_arch)',
+          'conditions': [
+            ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or \
+               OS=="netbsd" or OS=="mac" or OS=="qnx" or OS=="aix"', {
+              # This handles the Unix platforms we generally deal with.
+              # Anything else gets passed through, which probably won't work
+              # very well; such hosts should pass an explicit target_arch
+              # to gyp.
+              'host_arch%': '<!pymod_do_main(detect_v8_host_arch)',
+            }, {
+              # OS!="linux" and OS!="freebsd" and OS!="openbsd" and
+              # OS!="netbsd" and OS!="mac" and OS!="aix"
+              'host_arch%': 'ia32',
+            }],
+          ],
 
           # By default we build against a stable sysroot image to avoid
           # depending on the packages installed on the local machine. Set this
@@ -75,7 +71,7 @@
           'use_sysroot%': 1,
         },
         'host_arch%': '<(host_arch)',
-        'target_arch%': '<(target_arch)',
+        'target_arch%': '<(host_arch)',
         'use_sysroot%': '<(use_sysroot)',
         'base_dir%': '<!(cd <(DEPTH) && python -c "import os; print os.getcwd()")',