summaryrefslogtreecommitdiffstats
path: root/media/tests
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2014-02-28 13:23:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-02-28 13:23:15 +0000
commitfc9276340897289b8f848fc722152d6fc0f891ed (patch)
tree14cca48e01e4c491bd5ffe9499a96cd2e42e9d91 /media/tests
parentef23865154bf5e6c1768023dd69845353cf8c543 (diff)
parenteece0dda56ae29fff6e9003df97594f6ac50b6e2 (diff)
downloadframeworks_base-fc9276340897289b8f848fc722152d6fc0f891ed.zip
frameworks_base-fc9276340897289b8f848fc722152d6fc0f891ed.tar.gz
frameworks_base-fc9276340897289b8f848fc722152d6fc0f891ed.tar.bz2
Merge "Fix includes so that they no longer rely on the global Skia includes directories."
Diffstat (limited to 'media/tests')
-rw-r--r--media/tests/omxjpegdecoder/StreamSource.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/tests/omxjpegdecoder/StreamSource.h b/media/tests/omxjpegdecoder/StreamSource.h
index 6c34cbd..9807385 100644
--- a/media/tests/omxjpegdecoder/StreamSource.h
+++ b/media/tests/omxjpegdecoder/StreamSource.h
@@ -20,7 +20,7 @@
#include <stdio.h>
-#include <core/SkStream.h>
+#include <SkStream.h>
#include <media/stagefright/DataSource.h>
#include <media/stagefright/MediaErrors.h>
#include <utils/threads.h>