Revert of Use the system provided harfbuzz on chromeos

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 17 matching lines @@
             'use_ash%': 0,
 
             # Whether or not we are using CRAS, the ChromeOS Audio Server.
             'use_cras%': 0,
 
             # Use a raw surface abstraction.
             'use_ozone%': 0,
 
             # 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)',
           'use_aura%': '<(use_aura)',
           'use_ash%': '<(use_ash)',
           'use_cras%': '<(use_cras)',
           'use_ozone%': '<(use_ozone)',
           'embedded%': '<(embedded)',
-          'host_arch%': '<(host_arch)',
 
           # Whether we are using Views Toolkit
           'toolkit_views%': 0,
 
           # Use OpenSSL instead of NSS. Under development: see http://crbug.com/62803
           'use_openssl%': 0,
 
           # Disable viewport meta tag by default.
           'enable_viewport%': 0,
 
@@ skipping 33 matching lines @@
               'use_aura%': 1,
             }],
 
             # Whether we're a traditional desktop unix.
             ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and chromeos==0', {
               'desktop_linux%': 1,
             }, {
               '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,
             }],
 
             ['embedded==1', {
               '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)',
-            }],
           ],
         },
         # Copy conditionally-set variables out one scope.
         'chromeos%': '<(chromeos)',
         'desktop_linux%': '<(desktop_linux)',
         'use_aura%': '<(use_aura)',
         'use_ash%': '<(use_ash)',
         'use_cras%': '<(use_cras)',
         'use_ozone%': '<(use_ozone)',
         'embedded%': '<(embedded)',
         'use_openssl%': '<(use_openssl)',
         'use_system_fontconfig%': '<(use_system_fontconfig)',
         'enable_viewport%': '<(enable_viewport)',
         'enable_hidpi%': '<(enable_hidpi)',
         'buildtype%': '<(buildtype)',
         'branding%': '<(branding)',
         'host_arch%': '<(host_arch)',
-        'target_arch%': '<(target_arch)',
 
         'target_subarch%': '',
 
         # This is set when building the Android WebView inside the Android
         # build system, using the 'android' gyp backend. The WebView code is
         # still built when this is unset, but builds using the normal chromium
         # build system.
         'android_webview_build%': 0,
 
         # Set ARM architecture version.
         'arm_version%': 7,
 
         # Use aurax11 for clipboard implementation. This is true on linux_aura.
         'use_clipboard_aurax11%': 0,
 
         # goma settings.
         # 1 to use goma.
         # 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.
           ['use_aura==0', {
             'use_ash%': 0,
           }],
 
           # Set default value of toolkit_views based on OS.
           ['OS=="win" or chromeos==1 or use_aura==1', {
             'toolkit_views%': 1,
           }, {
@@ skipping 50 matching lines @@
           # "arm64" and "both" (meaning a fat binary).
           #
           # TODO(sdefresne): change the default from "arm32" to "both" for
           # "target_subarch" once http://crbug.com/339477 is fixed.
           #
           # TODO(sdefresne): set the "target_arch" to "arm" once compilation
           # 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)',
+          }],
         ],
       },
 
       # Copy conditionally-set variables out one scope.
       'chromeos%': '<(chromeos)',
       'host_arch%': '<(host_arch)',
       'target_arch%': '<(target_arch)',
       'target_subarch%': '<(target_subarch)',
       'toolkit_views%': '<(toolkit_views)',
       'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
@@ skipping 10 matching lines @@
       'enable_viewport%': '<(enable_viewport)',
       'enable_hidpi%': '<(enable_hidpi)',
       'android_webview_build%': '<(android_webview_build)',
       'use_goma%': '<(use_goma)',
       'gomadir%': '<(gomadir)',
       'enable_app_list%': '<(enable_app_list)',
       'use_default_render_theme%': '<(use_default_render_theme)',
       '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,
 
       # Set to 1 to enable fast builds. Set to 2 for even faster builds
       # (it disables debug info for fastest compilation - only for use
       # on compile-only bots).
       'fastbuild%': 0,
 
       # Set to 1 to enable dcheck in release.
       'dcheck_always_on%': 0,
 
       # Set to 1 to make a build that disables unshipped tracing events.
       # Note: this setting is ignored if buildtype=="Official".
       'tracing_like_official_build%': 0,
 
       # Disable image loader component extension by default.
       'image_loader_extension%': 0,
 
       # Python version.
       'python_ver%': '2.6',
 
       # Set NEON compilation flags.
       'arm_neon%': 1,
 
       # 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',
 
       # Use libjpeg-turbo as the JPEG codec used by Chromium.
       'use_libjpeg_turbo%': 1,
 
       # Use system libjpeg. Note that the system's libjepg will be used even if
       # use_libjpeg_turbo is set.
       'use_system_libjpeg%': 0,
 
@@ skipping 2717 matching lines @@
             'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'],
           },
           'Release_x64': {
             'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'],
           },
         }],
       ],
     },
   },
   'conditions': [
-    ['os_posix==1 and (chromeos==0 or target_arch!="arm")', {
+    # TODO(jochen): Enable this on chromeos. http://crbug.com/353127
+    ['os_posix==1 and chromeos==0', {
       'target_defaults': {
         'ldflags': [
           '-Wl,--fatal-warnings',
           '-Wl,-z,now',
           '-Wl,-z,relro',
         ],
       },
     }],
     ['os_posix==1 and chromeos==0', {
       # Chrome OS enables -fstack-protector-strong via its build wrapper,
@@ skipping 2116 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',
   },
 }