diff options
| author | alokp <alokp@chromium.org> | 2016-03-10 11:12:22 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-10 19:13:20 +0000 |
| commit | 89e5e9707432b52b19046f8aedee9021aae97e31 (patch) | |
| tree | 10cef6a878ec1fe0df94431c7df34636b28b8209 /chromecast | |
| parent | e7e19cb2ab8b42feb7fa9d25fd313ec14d51b28b (diff) | |
| download | chromium_src-89e5e9707432b52b19046f8aedee9021aae97e31.zip chromium_src-89e5e9707432b52b19046f8aedee9021aae97e31.tar.gz chromium_src-89e5e9707432b52b19046f8aedee9021aae97e31.tar.bz2 | |
Revert of Add the missing asset file cast_shell.pak back (patchset #3 id:40001 of https://codereview.chromium.org/1776933002/ )
Reason for revert:
Break chromecast gyp build:
"unknown target 'assets/cast_shell.pak'"
Original issue's description:
> Add the missing asset file cast_shell.pak back
>
> All files under assets directory will be removed when building cast_shell_icudata target. We have to make sure all the asset files must be collected here.
>
> BUG=593277
>
> Committed: https://crrev.com/c058232e6063829ab7db5dab45bdbdbb988b06d0
> Cr-Commit-Position: refs/heads/master@{#380202}
TBR=michaelbai@chromium.org,halliwell@chromium.org,sanfin@chromium.org,tsunghung@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=593277
Review URL: https://codereview.chromium.org/1782133003
Cr-Commit-Position: refs/heads/master@{#380440}
Diffstat (limited to 'chromecast')
| -rw-r--r-- | chromecast/chromecast.gyp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chromecast/chromecast.gyp b/chromecast/chromecast.gyp index 6bb8a14..daab117 100644 --- a/chromecast/chromecast.gyp +++ b/chromecast/chromecast.gyp @@ -297,7 +297,7 @@ ], }], ], - 'pak_output': '<(PRODUCT_DIR)/cast_shell.pak', + 'pak_output': '<(PRODUCT_DIR)/assets/cast_shell.pak', }, 'includes': [ '../build/repack_action.gypi' ], }, @@ -563,7 +563,6 @@ 'target_name': 'cast_shell_icudata', 'type': 'none', 'dependencies': [ - 'cast_shell_pak', '../third_party/icu/icu.gyp:icudata', '../v8/tools/gyp/v8.gyp:v8_external_snapshot', ], @@ -571,7 +570,6 @@ 'dest_path': '<(cast_shell_assets_path)', 'src_files': [ '<(PRODUCT_DIR)/icudtl.dat', - '<(PRODUCT_DIR)/cast_shell.pak', ], 'renaming_sources': [ '<(PRODUCT_DIR)/natives_blob.bin', |