tree 7e1136fcb3a24d7fe5be0d5b931e9594252e1293
parent 59e7d238522145e00357c54d71a4216b279faf1c
author halcanary@google.com <halcanary@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1399658904 +0000
committer halcanary@google.com <halcanary@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1399658904 +0000

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