Add a content_resources target which currently includes the sandbox definitions on mac

BUG=90443
TEST=none


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

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

8 files changed, 73 insertions, 1 deletions

diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index a7db110..ebbe5661 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -168,6 +168,9 @@
       <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
         <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json" type="BINDATA" />
       </if>
+      <if expr="pp_ifdef('is_macosx')">
+        <include name="IDR_NACL_SANDBOX_DEFINITION" file="nacl_loader.sb" type="BINDATA" />
+      </if>
     </includes>
   </release>
 </grit>
diff --git a/chrome/chrome_repack_chrome.gypi b/chrome/chrome_repack_chrome.gypi
index f7f6795..aa6a1c4 100644
--- a/chrome/chrome_repack_chrome.gypi
+++ b/chrome/chrome_repack_chrome.gypi
@@ -10,6 +10,7 @@
       '<(grit_out_dir)/default_plugin_resources/default_plugin_resources.pak',
       '<(grit_out_dir)/renderer_resources.pak',
       '<(grit_out_dir)/theme_resources.pak',
+      '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
       '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
       '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.pak',
       '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index 7c8692f..3eccfa0 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -301,6 +301,7 @@
         'default_plugin/default_plugin.gyp:default_plugin_resources',
         'platform_locale_settings',
         'theme_resources',
+        '<(DEPTH)/content/content_resources.gyp:content_resources',
         '<(DEPTH)/net/net.gyp:net_resources',
         '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
         '<(DEPTH)/ui/ui.gyp:gfx_resources',
diff --git a/content/content.gyp b/content/content.gyp
index 311c714..51ff0f1 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -65,6 +65,9 @@
        'includes': [
           'content_common.gypi',
         ],
+       'dependencies': [
+          'content_resources.gyp:content_resources',
+        ],
       },
       {'target_name': 'content_gpu',
        'type': 'static_library',
@@ -217,7 +220,7 @@
       },
       {'target_name': 'content_common',
        'type': 'none',
-       'dependencies': ['content'],
+       'dependencies': ['content', 'content_resources.gyp:content_resources'],
       },
       {'target_name': 'content_gpu',
        'type': 'none',
diff --git a/content/content_resources.grd b/content/content_resources.grd
new file mode 100644
index 0000000..cbfebb1
--- /dev/null
+++ b/content/content_resources.grd
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+This file contains resources required by each embedder of content.
+
+Currently, the resources are only included on Linux and Mac. If you add
+resources that need to be available on windows as well, you'll need to add
+content_resources.rc file to the respective targets.
+-->
+
+<grit latest_public_release="0" current_release="1">
+  <outputs>
+    <output filename="grit/content_resources.h" type="rc_header">
+      <emit emit_type='prepend'></emit>
+    </output>
+    <output filename="content_resources.pak" type="data_package" />
+    <output filename="content_resources.rc" type="rc_all" />
+  </outputs>
+  <translations />
+  <release seq="1">
+    <includes>
+      <if expr="is_macosx">
+        <include name="IDR_GPU_SANDBOX_DEFINITION" file="browser/gpu.sb" type="BINDATA" />
+        <include name="IDR_WORKER_SANDBOX_DEFINITION" file="browser/worker.sb" type="BINDATA" />
+        <include name="IDR_COMMON_SANDBOX_DEFINITION" file="common/common.sb" type="BINDATA" />
+        <include name="IDR_PPAPI_SANDBOX_DEFINITION" file="ppapi_plugin/ppapi.sb" type="BINDATA" />
+        <include name="IDR_RENDERER_SANDBOX_DEFINITION" file="renderer/renderer.sb" type="BINDATA" />
+        <include name="IDR_UTILITY_SANDBOX_DEFINITION" file="utility/utility.sb" type="BINDATA" />
+      </if>
+    </includes>
+  </release>
+</grit>
diff --git a/content/content_resources.gyp b/content/content_resources.gyp
new file mode 100644
index 0000000..63b6f6a
--- /dev/null
+++ b/content/content_resources.gyp
@@ -0,0 +1,28 @@
+# Copyright (c) 2011 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.
+
+# TODO(jochen): make this a .gypi file and include it in content.gyp, once
+# content.gyp doesn't depend on gyp files from chrome/ anymore:
+# http://crbug.com/10394
+{
+  'variables': {
+    'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content',
+  },
+  'targets': [
+    {
+      'target_name': 'content_resources',
+      'type': 'none',
+      'actions': [
+        {
+          'action_name': 'content_resources',
+          'variables': {
+            'grit_grd_file': 'content_resources.grd',
+          },
+          'includes': [ '../build/grit_action.gypi' ],
+        },
+      ],
+      'includes': [ '../build/grit_target.gypi' ],
+    },
+  ],
+}
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 7d28c2c..bd5558b 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -21,6 +21,7 @@
         'content_renderer',
         'content_utility',
         'content_worker',
+        'content_resources.gyp:content_resources',
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../build/temp_gyp/googleurl.gyp:googleurl',
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index d8f71ff..c7bdb8f 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -172,4 +172,7 @@
   "ui/resources/ui_resources_large.grd": {
     "includes": [24000],
   },
+  "content/content_resources.grd": {
+    "includes": [24500],
+  },
 }