diff options
| author |  halcanary@google.com <halcanary@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-09 18:08:24 +0000 |
|---|---|---|
| committer | halcanary@google.com <halcanary@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-09 18:08:24 +0000 |
| commit | b7acbfe0ee940863b5e2350b0b0c3795e01751f5 (patch) | |
| tree | 7e1136fcb3a24d7fe5be0d5b931e9594252e1293 /resources | |
| parent | 59e7d238522145e00357c54d71a4216b279faf1c (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
Review URL: https://codereview.chromium.org/264583007
git-svn-id: http://skia.googlecode.com/svn/trunk@14682 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'resources')
| -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 (renamed from resources/encoding/randPixels.jpg) | bin | 329 -> 329 bytes |
| -rw-r--r-- | resources/randPixels.png (renamed from resources/encoding/randPixels.png) | bin | 268 -> 268 bytes |
| -rw-r--r-- | resources/randPixels.webp (renamed from resources/encoding/randPixels.webp) | bin | 308 -> 308 bytes |
5 files changed, 0 insertions, 0 deletions
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/encoding/randPixels.jpg b/resources/randPixels.jpg Binary files differindex ca57fbddf3..ca57fbddf3 100644 --- a/resources/encoding/randPixels.jpg +++ b/resources/randPixels.jpg diff --git a/resources/encoding/randPixels.png b/resources/randPixels.png Binary files differindex 49ef84603f..49ef84603f 100644 --- a/resources/encoding/randPixels.png +++ b/resources/randPixels.png diff --git a/resources/encoding/randPixels.webp b/resources/randPixels.webp Binary files differindex 135441e541..135441e541 100644 --- a/resources/encoding/randPixels.webp +++ b/resources/randPixels.webp |
