diff options
| author | Yang Ni <yangni@google.com> | 2015-02-14 18:00:59 -0800 |
|---|---|---|
| committer | Yang Ni <yangni@google.com> | 2015-02-15 20:10:40 +0000 |
| commit | b8353c5943f4038fd7f08db3d958390ce9418798 (patch) | |
| tree | 2cfac49d1f790e077f40dfc7ba42904ee5658f50 /rsGrallocConsumer.h | |
| parent | 1ce0dfd82311d4922dbffdde302599410fc25c5d (diff) | |
| download | rs-b8353c5943f4038fd7f08db3d958390ce9418798.tar.gz | |
Revert "Replaced android::Vector with std::vector."
b/19148482
This reverts commit 93d6bc872b7d9fba63abfa7513d56b38d9c3d371.
I also made some changes to Make it work with HEAD.
Change-Id: I5e516976ec1d85ffe1cf388c01795348a9441982
Diffstat (limited to 'rsGrallocConsumer.h')
| -rw-r--r-- | rsGrallocConsumer.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rsGrallocConsumer.h b/rsGrallocConsumer.h index 527e734a..3ffee28d 100644 --- a/rsGrallocConsumer.h +++ b/rsGrallocConsumer.h @@ -17,12 +17,12 @@ #ifndef ANDROID_RS_GRALLOC_CONSUMER_H #define ANDROID_RS_GRALLOC_CONSUMER_H -#include <vector> - #include <gui/ConsumerBase.h> #include <ui/GraphicBuffer.h> +#include <utils/String8.h> +#include <utils/Vector.h> #include <utils/threads.h> @@ -75,3 +75,4 @@ class GrallocConsumer : public ConsumerBase } // namespace android #endif // ANDROID_RS_GRALLOC_CONSUMER_H + |