diff options
Diffstat (limited to 'chrome')
3 files changed, 11 insertions, 12 deletions
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp index 2d4c063..e65ca54 100644 --- a/chrome/chrome_resources.gyp +++ b/chrome/chrome_resources.gyp @@ -237,16 +237,6 @@ '<(DEPTH)/ui/ui.gyp:ui_resources_touch', ], 'conditions': [ - ['chromeos==1', { - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)', - 'files': [ - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_touch/ui_resources_touch.pak', - ], - }, - ], - }], ['OS != "mac"', { # Copy pak files to the product directory. These files will be picked # up by the following installer scripts: @@ -254,7 +244,7 @@ # - Linux: chrome/installer/linux/internal/common/installer.include # Ensure that the above scripts are updated when adding or removing # pak files. - # Coping files to the product directory is not needed on the Mac + # Copying files to the product directory is not needed on the Mac # since the framework build phase will copy them into the framework # bundle directly. 'copies': [ @@ -278,12 +268,13 @@ }, ], }], - ['enable_metro == 1', { + ['enable_touch_ui==1', { 'copies': [ { 'destination': '<(PRODUCT_DIR)', 'files': [ '<(grit_out_dir)/theme_resources_touch_1x.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_touch/ui_resources_touch.pak', ], }, ], diff --git a/chrome/test/chromeos/autotest/files/client/deps/chrome_test/setup_test_links.sh b/chrome/test/chromeos/autotest/files/client/deps/chrome_test/setup_test_links.sh index 813036a..e1e27b3 100755 --- a/chrome/test/chromeos/autotest/files/client/deps/chrome_test/setup_test_links.sh +++ b/chrome/test/chromeos/autotest/files/client/deps/chrome_test/setup_test_links.sh @@ -16,8 +16,12 @@ ln -f -s /opt/google/chrome/chrome.pak $(dirname $0)/chrome.pak ln -f -s /opt/google/chrome/resources.pak $(dirname $0)/resources.pak ln -f -s /opt/google/chrome/ui_resources_standard.pak \ $(dirname $0)/ui_resources_standard.pak +ln -f -s /opt/google/chrome/ui_resources_touch.pak \ + $(dirname $0)/ui_resources_touch.pak ln -f -s /opt/google/chrome/theme_resources_standard.pak \ $(dirname $0)/theme_resources_standard.pak +ln -f -s /opt/google/chrome/theme_resources_touch_1x.pak \ + $(dirname $0)/theme_resources_touch_1x.pak mkdir -p $(dirname $0)/chromeos ln -f -s /opt/google/chrome/chromeos/libcros.so \ diff --git a/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/setup_test_links.sh b/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/setup_test_links.sh index daa13e3..f48b74a 100755 --- a/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/setup_test_links.sh +++ b/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/setup_test_links.sh @@ -15,8 +15,12 @@ ln -f -s /opt/google/chrome/chrome.pak $(dirname $0)/chrome.pak ln -f -s /opt/google/chrome/resources.pak $(dirname $0)/resources.pak ln -f -s /opt/google/chrome/ui_resources_standard.pak \ $(dirname $0)/ui_resources_standard.pak +ln -f -s /opt/google/chrome/ui_resources_touch.pak \ + $(dirname $0)/ui_resources_touch.pak ln -f -s /opt/google/chrome/theme_resources_standard.pak \ $(dirname $0)/theme_resources_standard.pak +ln -f -s /opt/google/chrome/theme_resources_touch_1x.pak \ + $(dirname $0)/theme_resources_touch_1x.pak mkdir -p $(dirname $0)/chromeos ln -f -s /opt/google/chrome/chromeos/libcros.so \ |