diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-09 16:24:06 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-09 16:24:06 +0000 |
| commit | e5e96021a05f22ffbb72a201790bd67bff4f8a93 (patch) | |
| tree | 99ccda9e7bbab26890a73c6520b9c0961c926768 /resources | |
| parent | d12de02542867c7c1be32b6e02e2f5dca9fb9452 (diff) | |
Flatten resources directory
On android trybots, the files in a subdirectory weren't being
loaded onto the device. Consequently, the ImageDecoderOptions
test was not testing anything. I had to relax that unit test
to reflect the existing behavior of our libjpeg decoder on
Android.
R=djsollen@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/264583007
git-svn-id: http://skia.googlecode.com/svn/trunk@14678 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/encoding/randPixels.jpg | bin | 329 -> 0 bytes |
| -rw-r--r-- | resources/encoding/randPixels.png | bin | 268 -> 0 bytes |
| -rw-r--r-- | resources/encoding/randPixels.webp | bin | 308 -> 0 bytes |
| -rw-r--r-- | resources/randPixels.bmp (renamed from resources/encoding/randPixels.bmp) | bin | 246 -> 246 bytes |
| -rw-r--r-- | resources/randPixels.gif (renamed from resources/encoding/randPixels.gif) | bin | 277 -> 277 bytes |
| -rw-r--r-- | resources/randPixels.jpg | bin | 0 -> 329 bytes |
| -rw-r--r-- | resources/randPixels.png | bin | 0 -> 267 bytes |
| -rw-r--r-- | resources/randPixels.webp | bin | 0 -> 308 bytes |
8 files changed, 0 insertions, 0 deletions
diff --git a/resources/encoding/randPixels.jpg b/resources/encoding/randPixels.jpg Binary files differdeleted file mode 100644 index ca57fbddf3..0000000000 --- a/resources/encoding/randPixels.jpg +++ /dev/null diff --git a/resources/encoding/randPixels.png b/resources/encoding/randPixels.png Binary files differdeleted file mode 100644 index 49ef84603f..0000000000 --- a/resources/encoding/randPixels.png +++ /dev/null diff --git a/resources/encoding/randPixels.webp b/resources/encoding/randPixels.webp Binary files differdeleted file mode 100644 index 135441e541..0000000000 --- a/resources/encoding/randPixels.webp +++ /dev/null diff --git a/resources/encoding/randPixels.bmp b/resources/randPixels.bmp Binary files differindex 1e4ab3b652..1e4ab3b652 100644 --- a/resources/encoding/randPixels.bmp +++ b/resources/randPixels.bmp diff --git a/resources/encoding/randPixels.gif b/resources/randPixels.gif Binary files differindex 04c8bb9c3a..04c8bb9c3a 100644 --- a/resources/encoding/randPixels.gif +++ b/resources/randPixels.gif diff --git a/resources/randPixels.jpg b/resources/randPixels.jpg Binary files differnew file mode 100644 index 0000000000..8f26ea0277 --- /dev/null +++ b/resources/randPixels.jpg diff --git a/resources/randPixels.png b/resources/randPixels.png Binary files differnew file mode 100644 index 0000000000..8cd8e65c60 --- /dev/null +++ b/resources/randPixels.png diff --git a/resources/randPixels.webp b/resources/randPixels.webp Binary files differnew file mode 100644 index 0000000000..9c4aceadab --- /dev/null +++ b/resources/randPixels.webp |
