Commit 2aea307c authored by Michael Thiessen's avatar Michael Thiessen Committed by Commit Bot

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: default avatarMichael Thiessen <mthiesse@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553578}
parent 14ebddd2
...@@ -16,8 +16,7 @@ import argparse ...@@ -16,8 +16,7 @@ import argparse
import collections import collections
import multiprocessing.pool import multiprocessing.pool
import os import os
import re faydimport shutil
import shutil
import subprocess import subprocess
import sys import sys
import zipfile import zipfile
...@@ -55,8 +54,8 @@ _PNG_WEBP_BLACKLIST_PATTERN = re.compile('|'.join([ ...@@ -55,8 +54,8 @@ _PNG_WEBP_BLACKLIST_PATTERN = re.compile('|'.join([
r'.*star_gray\.png', r'.*star_gray\.png',
# Android requires pngs for 9-patch images. # Android requires pngs for 9-patch images.
r'.*\.9\.png', r'.*\.9\.png',
# Daydream (*.dd) requires pngs for icon files. # Daydream requires pngs for icon files.
r'.*\.dd\.png'])) r'.*daydream_icon_.*\.png']))
# Regular expression for package declaration in 'aapt dump resources' output. # Regular expression for package declaration in 'aapt dump resources' output.
_RE_PACKAGE_DECLARATION = re.compile( _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