tree 99ccda9e7bbab26890a73c6520b9c0961c926768
parent d12de02542867c7c1be32b6e02e2f5dca9fb9452
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> 1399652646 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> 1399652646 +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

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