diff options
author | scottmg <scottmg@chromium.org> | 2016-03-12 16:15:16 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-13 00:16:07 +0000 |
commit | 170c14bac8a2dc89c34907545116fb0a64e4f351 (patch) | |
tree | a8bdcd5add9c5bb51e5fbc51ce2e3f904b9c4aa4 /win8 | |
parent | 4a95ca5a4bab60f9f54325036516b640d263e2ec (diff) | |
download | chromium_src-170c14bac8a2dc89c34907545116fb0a64e4f351.zip chromium_src-170c14bac8a2dc89c34907545116fb0a64e4f351.tar.gz chromium_src-170c14bac8a2dc89c34907545116fb0a64e4f351.tar.bz2 |
Fix missing VisualElementsManifest.xml
Move out of metro_driver too, as it doesn't have anything to do with
Metro in its current incarnation.
TBR=brettw@chromium.org
R=gab@chromium.org, grt@chromium.org, dpranke@chromium.org
BUG=593411
Review URL: https://codereview.chromium.org/1790723002
Cr-Commit-Position: refs/heads/master@{#380886}
Diffstat (limited to 'win8')
-rw-r--r-- | win8/BUILD.gn | 13 | ||||
-rw-r--r-- | win8/metro_driver/BUILD.gn | 16 | ||||
-rw-r--r-- | win8/metro_driver/metro_driver.gyp | 12 | ||||
-rw-r--r-- | win8/resources/Logo.png (renamed from win8/metro_driver/resources/Logo.png) | bin | 27252 -> 27252 bytes | |||
-rw-r--r-- | win8/resources/SecondaryTile.png (renamed from win8/metro_driver/resources/SecondaryTile.png) | bin | 637 -> 637 bytes | |||
-rw-r--r-- | win8/resources/SmallLogo.png (renamed from win8/metro_driver/resources/SmallLogo.png) | bin | 27252 -> 27252 bytes | |||
-rw-r--r-- | win8/resources/chrome.VisualElementsManifest.xml (renamed from win8/metro_driver/resources/chrome.VisualElementsManifest.xml) | 0 | ||||
-rw-r--r-- | win8/win8.gyp | 16 |
8 files changed, 29 insertions, 28 deletions
diff --git a/win8/BUILD.gn b/win8/BUILD.gn index 7b36f33..0fab11e 100644 --- a/win8/BUILD.gn +++ b/win8/BUILD.gn @@ -50,3 +50,16 @@ executable("test_registrar") { "//chrome", ] } + +copy("visual_elements_resources") { + sources = [ + "resources/Logo.png", + "resources/SecondaryTile.png", + "resources/SmallLogo.png", + "resources/chrome.VisualElementsManifest.xml", + ] + + outputs = [ + "$root_out_dir/{{source_file_part}}", + ] +} diff --git a/win8/metro_driver/BUILD.gn b/win8/metro_driver/BUILD.gn index fc66690..346b631 100644 --- a/win8/metro_driver/BUILD.gn +++ b/win8/metro_driver/BUILD.gn @@ -16,7 +16,6 @@ shared_library("metro_driver") { ] deps = [ - ":copy_resources", ":version_resources", "//base", "//chrome/common:constants", @@ -86,21 +85,6 @@ process_version("version_resources") { template_file = chrome_version_rc_template } -copy("copy_resources") { - visibility = [ ":*" ] - - sources = [ - "resources/Logo.png", - "resources/SecondaryTile.png", - "resources/SmallLogo.png", - "resources/chrome.VisualElementsManifest.xml", - ] - - outputs = [ - "$root_out_dir/{{source_file_part}}", - ] -} - test("metro_driver_unittests") { sources = [ "run_all_unittests.cc", diff --git a/win8/metro_driver/metro_driver.gyp b/win8/metro_driver/metro_driver.gyp index a6f9afa..663990a 100644 --- a/win8/metro_driver/metro_driver.gyp +++ b/win8/metro_driver/metro_driver.gyp @@ -102,18 +102,6 @@ ], }], ], - 'copies': [ - { - # GN version: //win8/metro_viewer:copy_resources - 'destination': '<(PRODUCT_DIR)', - 'files': [ - 'resources/Logo.png', - 'resources/SecondaryTile.png', - 'resources/SmallLogo.png', - 'resources/chrome.VisualElementsManifest.xml', - ], - }, - ], }, { # GN version: //win8/metro_driver:metro_driver_unittests diff --git a/win8/metro_driver/resources/Logo.png b/win8/resources/Logo.png Binary files differindex eff95d9..eff95d9 100644 --- a/win8/metro_driver/resources/Logo.png +++ b/win8/resources/Logo.png diff --git a/win8/metro_driver/resources/SecondaryTile.png b/win8/resources/SecondaryTile.png Binary files differindex 9c9e453..9c9e453 100644 --- a/win8/metro_driver/resources/SecondaryTile.png +++ b/win8/resources/SecondaryTile.png diff --git a/win8/metro_driver/resources/SmallLogo.png b/win8/resources/SmallLogo.png Binary files differindex eff95d9..eff95d9 100644 --- a/win8/metro_driver/resources/SmallLogo.png +++ b/win8/resources/SmallLogo.png diff --git a/win8/metro_driver/resources/chrome.VisualElementsManifest.xml b/win8/resources/chrome.VisualElementsManifest.xml index 640ef97..640ef97 100644 --- a/win8/metro_driver/resources/chrome.VisualElementsManifest.xml +++ b/win8/resources/chrome.VisualElementsManifest.xml diff --git a/win8/win8.gyp b/win8/win8.gyp index 8131fa3..3a59e77 100644 --- a/win8/win8.gyp +++ b/win8/win8.gyp @@ -38,5 +38,21 @@ 'test/test_registrar_constants.h', ], }, + { + 'target_name': 'visual_elements_resources', + 'type': 'none', + 'copies': [ + { + # GN version: //win8/visual_elements_resources + 'destination': '<(PRODUCT_DIR)', + 'files': [ + 'resources/Logo.png', + 'resources/SecondaryTile.png', + 'resources/SmallLogo.png', + 'resources/chrome.VisualElementsManifest.xml', + ], + }, + ], + }, ], } |