diff options
| author | John Abd-El-Malek <jam@chromium.org> | 2014-10-28 09:23:21 -0700 |
|---|---|---|
| committer | John Abd-El-Malek <jam@chromium.org> | 2014-10-28 16:24:50 +0000 |
| commit | 60913bcd536aafd205f760cb0979610886c9cd34 (patch) | |
| tree | ce73d5a85ff8f7d49fc89e3aa5e73c47cc98b51a /athena/resources/athena_resources.gyp | |
| parent | 4056c3244391cbd2103e402ceaf557924d452783 (diff) | |
| download | chromium_src-60913bcd536aafd205f760cb0979610886c9cd34.zip chromium_src-60913bcd536aafd205f760cb0979610886c9cd34.tar.gz chromium_src-60913bcd536aafd205f760cb0979610886c9cd34.tar.bz2 | |
Revert "Remove athena_main dependency on ash_resources.h"
This reverts commit 4056c3244391cbd2103e402ceaf557924d452783.
Cr-Commit-Position: refs/heads/master@{#301641}
Diffstat (limited to 'athena/resources/athena_resources.gyp')
| -rw-r--r-- | athena/resources/athena_resources.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/athena/resources/athena_resources.gyp b/athena/resources/athena_resources.gyp index 1cc542e..bfe3a51 100644 --- a/athena/resources/athena_resources.gyp +++ b/athena/resources/athena_resources.gyp @@ -28,6 +28,7 @@ 'target_name': 'athena_pak', 'type': 'none', 'dependencies': [ + '../../ash/ash_resources.gyp:ash_resources', '../../components/components_resources.gyp:components_resources', '../../components/components_strings.gyp:components_strings', '../../content/app/resources/content_resources.gyp:content_resources', @@ -42,6 +43,7 @@ 'variables': { 'pak_inputs': [ '<(PRODUCT_DIR)/extensions_shell_and_test.pak', + '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/athena/resources/athena_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/athena/strings/athena_strings_en-US.pak', '<(SHARED_INTERMEDIATE_DIR)/components/components_resources_100_percent.pak', |