diff options
| author | Andy Doan <andy.doan@linaro.org> | 2012-01-04 22:27:43 +0000 |
|---|---|---|
| committer | Andy Doan <andy.doan@linaro.org> | 2012-01-04 22:27:43 +0000 |
| commit | 275b76ee7dcb55071af37c58c708e4c73080d139 (patch) | |
| tree | 0de3a40424932e2b0526212d7d007cec7855d7d6 | |
| parent | 182bced2926c3fcb4cf9fd8097793e2ab54ce044 (diff) | |
| download | base-275b76ee7dcb55071af37c58c708e4c73080d139.tar.gz | |
fix build break when using prebuilt toolchain
When doing a build with the prebuilt 4.4 toolchain a duplicate
symbol error is hit. This is due to the fact this symbol is
really defined system/core/include/system/window.h
Change-Id: I9dac8e4f483422a7d42ab0d305ece61197f936b9
Signed-off-by: Andy Doan <andy.doan@linaro.org>
| -rw-r--r-- | native/include/android/native_window.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/native/include/android/native_window.h b/native/include/android/native_window.h index 2f4f2d33bec9..45caed4918b3 100644 --- a/native/include/android/native_window.h +++ b/native/include/android/native_window.h @@ -18,6 +18,7 @@ #define ANDROID_NATIVE_WINDOW_H #include <android/rect.h> +#include <system/window.h> #ifdef __cplusplus extern "C" { @@ -32,9 +33,6 @@ enum { WINDOW_FORMAT_RGB_565 = 4, }; -struct ANativeWindow; -typedef struct ANativeWindow ANativeWindow; - typedef struct ANativeWindow_Buffer { // The number of pixels that are show horizontally. int32_t width; @@ -51,7 +49,7 @@ typedef struct ANativeWindow_Buffer { // The actual bits. void* bits; - + // Do not touch. uint32_t reserved[6]; } ANativeWindow_Buffer; |