This does a few things:

- only include cflags/linkflags and other compiler settings that are target-specific when building for 'target'
- make build tools (protoc) compile for 'host', and change the dependencies on them to reflect that.

Review URL: http://codereview.chromium.org/265031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30381 0039d316-1c4b-4281-b951-d872f2087c98

build/common.gypi

@@ -667,8 +667,8 @@
             ],
           }],
           ['target_arch=="arm"', {
-            'conditions': [
-              ['armv7==1', {
+            'target_conditions': [
+              ['armv7==1 and _toolset=="target"', {
                 'cflags': [
                   '-march=armv7-a',
                   '-mtune=cortex-a8',
@@ -679,12 +679,15 @@
             ],
           }],
           ['sysroot!=""', {
+            'target_conditions': [
+              ['_toolset=="target"', {
                 'cflags': [
                   '--sysroot=<(sysroot)',
                 ],
                 'ldflags': [
                   '--sysroot=<(sysroot)',
                 ],
+              }]]
           }],
           ['no_strict_aliasing==1', {
             'cflags': [

build/linux/system.gyp

@@ -19,6 +19,8 @@
     {
       'target_name': 'gtk',
       'type': 'settings',
+      'conditions': [
+        ['_toolset=="target"', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags gtk+-2.0 gthread-2.0)',
@@ -32,10 +34,13 @@
               '<!@(<(pkg-config) --libs-only-l gtk+-2.0 gthread-2.0)',
             ],
           },
+      }]]
     },
     {
       'target_name': 'gtkprint',
       'type': 'settings',
+      'conditions': [
+        ['_toolset=="target"', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags gtk+-unix-print-2.0)',
@@ -49,10 +54,13 @@
               '<!@(<(pkg-config) --libs-only-l gtk+-unix-print-2.0)',
             ],
           },
+      }]]
     },
     {
       'target_name': 'nss',
       'type': 'settings',
+      'conditions': [
+        ['_toolset=="target"', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags nss)',
@@ -66,10 +74,13 @@
               '<!@(<(pkg-config) --libs-only-l nss)',
             ],
           },
+      }]]
     },
     {
       'target_name': 'freetype2',
       'type': 'settings',
+      'conditions': [
+        ['_toolset=="target"', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags freetype2)',
@@ -83,10 +94,13 @@
               '<!@(<(pkg-config) --libs-only-l freetype2)',
             ],
           },
+      }]]
     },
     {
       'target_name': 'fontconfig',
       'type': 'settings',
+      'conditions': [
+        ['_toolset=="target"', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags fontconfig)',
@@ -100,10 +114,13 @@
               '<!@(<(pkg-config) --libs-only-l fontconfig)',
             ],
           },
+      }]]
     },
     {
       'target_name': 'gdk',
       'type': 'settings',
+      'conditions': [
+        ['_toolset=="target"', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags gdk-2.0)',
@@ -117,10 +134,13 @@
               '<!@(<(pkg-config) --libs-only-l gdk-2.0)',
             ],
           },
+      }]]
     },
     {
       'target_name': 'gconf',
       'type': 'settings',
+      'conditions': [
+        ['_toolset=="target"', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags gconf-2.0)',
@@ -134,10 +154,13 @@
               '<!@(<(pkg-config) --libs-only-l gconf-2.0)',
             ],
           },
+      }]]
     },
     {
       'target_name': 'x11',
       'type': 'settings',
+      'conditions': [
+        ['_toolset=="target"', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags x11)',
@@ -151,15 +174,19 @@
               '<!@(<(pkg-config) --libs-only-l x11)',
             ],
           },
+      }]]
     },
     {
       'target_name': 'selinux',
       'type': 'settings',
+      'conditions': [
+        ['_toolset=="target"', {
           'link_settings': {
             'libraries': [
               '-lselinux',
             ],
           },
+      }]]
     },
 # TODO(evanm): temporarily disabled while we figure out whether to depend
 # on gnome-keyring etc.

chrome/chrome.gyp

@@ -2895,7 +2895,7 @@
             ['chromeos==1 or toolkit_views==1',{
               'dependencies': [
                 '../third_party/protobuf2/protobuf.gyp:protobuf_lite',
-                '../third_party/protobuf2/protobuf.gyp:protoc',
+                '../third_party/protobuf2/protobuf.gyp:protoc#host',
                 '../third_party/cros/cros_api.gyp:cros_api',
               ],
               'actions': [
@@ -5102,7 +5102,7 @@
       ],
       'dependencies': [
         '../third_party/protobuf2/protobuf.gyp:protobuf_lite',
-        '../third_party/protobuf2/protobuf.gyp:protoc',
+        '../third_party/protobuf2/protobuf.gyp:protoc#host',
       ],
       'export_dependent_settings': [
         '../third_party/protobuf2/protobuf.gyp:protobuf_lite',

third_party/protobuf2/protobuf.gyp

@@ -38,6 +38,7 @@
     {
       'target_name': 'protobuf_lite',
       'type': '<(library)',
+      'toolsets': ['host', 'target'],
       'sources': [
         'src/src/google/protobuf/stubs/common.h',
         'src/src/google/protobuf/stubs/once.h',
@@ -92,6 +93,7 @@
     {
       'target_name': 'protobuf',
       'type': '<(library)',
+      'toolsets': ['host'],
       'sources': [
         'src/src/google/protobuf/descriptor.h',
         'src/src/google/protobuf/descriptor.pb.h',
@@ -149,6 +151,7 @@
     {
       'target_name': 'protoc',
       'type': 'executable',
+      'toolsets': ['host'],
       'sources': [
         'src/src/google/protobuf/compiler/code_generator.cc',
         'src/src/google/protobuf/compiler/command_line_interface.cc',