diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-04 14:17:57 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-05 10:05:06 +0000 |
| commit | 39d357e3248f80abea0159765ff39554affb40db (patch) | |
| tree | aba0e6bfb76de0244bba0f5fdbd64b830dd6e621 /chromium/content/content_resources.grd | |
| parent | 87778abf5a1f89266f37d1321b92a21851d8244d (diff) | |
| download | qtwebengine-chromium-39d357e3248f80abea0159765ff39554affb40db.tar.gz | |
BASELINE: Update Chromium to 55.0.2883.105
And updates ninja to 1.7.2
Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/content/content_resources.grd')
| -rw-r--r-- | chromium/content/content_resources.grd | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chromium/content/content_resources.grd b/chromium/content/content_resources.grd index 64d2f5300fc..cd40e2c5779 100644 --- a/chromium/content/content_resources.grd +++ b/chromium/content/content_resources.grd @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<grit latest_public_release="0" current_release="1"> +<grit latest_public_release="0" current_release="1" output_all_resource_defines="false"> <outputs> <output filename="grit/content_resources.h" type="rc_header"> <emit emit_type='prepend'></emit> @@ -28,11 +28,12 @@ <include name="IDR_MEDIA_INTERNALS_HTML" file="browser/resources/media/media_internals.html" flattenhtml="true" allowexternalscript="true" compress="gzip" type="BINDATA" /> <include name="IDR_MEDIA_INTERNALS_JS" file="browser/resources/media/media_internals.js" flattenhtml="true" compress="gzip" type="BINDATA" /> <include name="IDR_MOJO_CATALOG_MANIFEST" file="../services/catalog/manifest.json" type="BINDATA" /> - <include name="IDR_MOJO_CONTENT_BROWSER_MANIFEST" file="${root_out_dir}/content_browser_manifest.json" use_base_dir="false" type="BINDATA" /> - <include name="IDR_MOJO_CONTENT_GPU_MANIFEST" file="${root_out_dir}/content_gpu_manifest.json" use_base_dir="false" type="BINDATA" /> - <include name="IDR_MOJO_CONTENT_RENDERER_MANIFEST" file="${root_out_dir}/content_renderer_manifest.json" use_base_dir="false" type="BINDATA" /> - <include name="IDR_MOJO_CONTENT_UTILITY_MANIFEST" file="${root_out_dir}/content_utility_manifest.json" use_base_dir="false" type="BINDATA" /> - <include name="IDR_MOJO_PROFILE_MANIFEST" file="../services/user/manifest.json" type="BINDATA" /> + <include name="IDR_MOJO_CONTENT_BROWSER_MANIFEST" file="${root_out_dir}/Packages/content_browser/manifest.json" use_base_dir="false" type="BINDATA" /> + <include name="IDR_MOJO_CONTENT_GPU_MANIFEST" file="${root_out_dir}/Packages/content_gpu/manifest.json" use_base_dir="false" type="BINDATA" /> + <include name="IDR_MOJO_CONTENT_PLUGIN_MANIFEST" file="${root_out_dir}/Packages/content_plugin/manifest.json" use_base_dir="false" type="BINDATA" /> + <include name="IDR_MOJO_CONTENT_RENDERER_MANIFEST" file="${root_out_dir}/Packages/content_renderer/manifest.json" use_base_dir="false" type="BINDATA" /> + <include name="IDR_MOJO_CONTENT_UTILITY_MANIFEST" file="${root_out_dir}/Packages/content_utility/manifest.json" use_base_dir="false" type="BINDATA" /> + <include name="IDR_MOJO_FILE_MANIFEST" file="../services/file/manifest.json" type="BINDATA" /> <include name="IDR_NETWORK_ERROR_LISTING_HTML" file="browser/resources/net/network_errors_listing.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> <include name="IDR_NETWORK_ERROR_LISTING_JS" file="browser/resources/net/network_errors_listing.js" flattenhtml="true" type="BINDATA" /> <include name="IDR_NETWORK_ERROR_LISTING_CSS" file="browser/resources/net/network_errors_listing.css" flattenhtml="true" type="BINDATA" /> |