Revert of Use the system provided harfbuzz on chromeos

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index c1199a419218b1a256235a87842885eb9c33c3dd..246124f043f0deb5bf2b7a5194024103ae277c9a 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -35,15 +35,6 @@
 
             # Configure the build for small devices. See crbug.com/318413
             'embedded%': 0,
-
-            'conditions': [
-              # Compute the architecture that we're building on.
-              ['OS=="win" or OS=="mac" or OS=="ios"', {
-                'host_arch%': 'ia32',
-              }, {
-                'host_arch%': '<!(python <(DEPTH)/build/linux/detect_host_arch.py)',
-              }],
-            ],
           },
           # Copy conditionally-set variables out one scope.
           'chromeos%': '<(chromeos)',
@@ -52,7 +43,6 @@
           'use_cras%': '<(use_cras)',
           'use_ozone%': '<(use_ozone)',
           'embedded%': '<(embedded)',
-          'host_arch%': '<(host_arch)',
 
           # Whether we are using Views Toolkit
           'toolkit_views%': 0,
@@ -106,6 +96,13 @@
               'desktop_linux%': 0,
             }],
 
+            # Compute the architecture that we're building on.
+            ['OS=="win" or OS=="mac" or OS=="ios"', {
+              'host_arch%': 'ia32',
+            }, {
+              'host_arch%': '<!(python <(DEPTH)/build/linux/detect_host_arch.py)',
+            }],
+
             # Embedded implies ozone.
             ['embedded==1', {
               'use_ozone%': 1,
@@ -115,14 +112,6 @@
               'use_system_fontconfig%': 0,
             }, {
               'use_system_fontconfig%': 1,
-            }],
-
-            ['OS=="android"', {
-              'target_arch%': 'arm',
-            }, {
-              # Default architecture we're building for is the architecture we're
-              # building on, and possibly sub-architecture (for iOS builds).
-              'target_arch%': '<(host_arch)',
             }],
           ],
         },
@@ -141,7 +130,6 @@
         'buildtype%': '<(buildtype)',
         'branding%': '<(branding)',
         'host_arch%': '<(host_arch)',
-        'target_arch%': '<(target_arch)',
 
         'target_subarch%': '',
 
@@ -162,10 +150,6 @@
         # If no gomadir is set, it uses the default gomadir.
         'use_goma%': 0,
         'gomadir%': '',
-
-        # The system root for cross-compiles. Default: none.
-        'sysroot%': '',
-        'chroot_cmd%': '',
 
         'conditions': [
           # Ash needs Aura.
@@ -236,6 +220,13 @@
           # of skia has been fixed for simulator. http://crbug.com/342377
           ['OS=="ios"', {
             'target_subarch%': 'arm32',
+          }],
+          ['OS=="android"', {
+            'target_arch%': 'arm',
+          }, {
+            # Default architecture we're building for is the architecture we're
+            # building on, and possibly sub-architecture (for iOS builds).
+            'target_arch%': '<(host_arch)',
           }],
         ],
       },
@@ -267,8 +258,6 @@
       'buildtype%': '<(buildtype)',
       'branding%': '<(branding)',
       'arm_version%': '<(arm_version)',
-      'sysroot%': '<(sysroot)',
-      'chroot_cmd%': '<(chroot_cmd)',
 
       # Whether content/chrome is using mojo: see http://crbug.com/353602
       'use_mojo%': 0,
@@ -296,6 +285,10 @@
 
       # Detect NEON support at run-time.
       'arm_neon_optional%': 0,
+
+      # The system root for cross-compiles. Default: none.
+      'sysroot%': '',
+      'chroot_cmd%': '',
 
       # The system libdir used for this ABI.
       'system_libdir%': 'lib',
@@ -3034,7 +3027,8 @@
     },
   },
   'conditions': [
-    ['os_posix==1', {
+    # TODO(jochen): Enable this on chromeos. http://crbug.com/353127
+    ['os_posix==1 and chromeos==0', {
       'target_defaults': {
         'ldflags': [
           '-Wl,--fatal-warnings',