Commit c4a6b926 authored by Michael Thiessen's avatar Michael Thiessen Committed by Commit Bot

Revert "Reland "Remove ".dd" extension from VR icons""

This reverts commit 2aea307c.

Reason for revert: Bad merge. No idea how that happened.

Original change's description:
> Reland "Remove ".dd" extension from VR icons"
> 
> This reverts commit 14ebddd2.
> 
> Reason for revert: Fixing regex.
> 
> Original change's description:
> > Revert "Remove ".dd" extension from VR icons"
> > 
> > This reverts commit c00fe466.
> > 
> > Reason for revert: Breaks canary push
> > 
> > Original change's description:
> > > Remove ".dd" extension from VR icons
> > > 
> > > Bug: 834499
> > > Change-Id: I673de864b05a6e6e30a848631d15dce3743ca946
> > > Reviewed-on: https://chromium-review.googlesource.com/1023049
> > > Reviewed-by: Richard Coles <torne@chromium.org>
> > > Reviewed-by: agrieve <agrieve@chromium.org>
> > > Commit-Queue: Michael Thiessen <mthiesse@chromium.org>
> > > Cr-Commit-Position: refs/heads/master@{#552773}
> > 
> > TBR=mthiesse@chromium.org,torne@chromium.org,agrieve@chromium.org
> > 
> > NOTRY=true
> > 
> > Bug: 834499
> > Change-Id: I5b0094ad101b5f734c58156e86a453c8566a918c
> > Reviewed-on: https://chromium-review.googlesource.com/1028092
> > Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
> > Commit-Queue: Michael Thiessen <mthiesse@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#553577}
> 
> TBR=mthiesse@chromium.org,torne@chromium.org,agrieve@chromium.org
> 
> Change-Id: I7c790d21587e2eb912217b9aebbf01570a0aec05
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 834499
> Reviewed-on: https://chromium-review.googlesource.com/1028095
> Commit-Queue: Michael Thiessen <mthiesse@chromium.org>
> Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#553578}

TBR=mthiesse@chromium.org,torne@chromium.org,agrieve@chromium.org

Change-Id: I41383360a58384fae4498e79dd637c755d24a424
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 834499
Reviewed-on: https://chromium-review.googlesource.com/1028370Reviewed-by: default avatarMichael Thiessen <mthiesse@chromium.org>
Commit-Queue: Michael Thiessen <mthiesse@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553597}
parent a87ac911
......@@ -16,7 +16,8 @@ import argparse
import collections
import multiprocessing.pool
import os
faydimport shutil
import re
import shutil
import subprocess
import sys
import zipfile
......@@ -54,8 +55,8 @@ _PNG_WEBP_BLACKLIST_PATTERN = re.compile('|'.join([
r'.*star_gray\.png',
# Android requires pngs for 9-patch images.
r'.*\.9\.png',
# Daydream requires pngs for icon files.
r'.*daydream_icon_.*\.png']))
# Daydream (*.dd) requires pngs for icon files.
r'.*\.dd\.png']))
# Regular expression for package declaration in 'aapt dump resources' output.
_RE_PACKAGE_DECLARATION = re.compile(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment