[waffle] [PATCH] android: Fix Android Kitkat build issue

Chad Versace chad.versace at linux.intel.com
Mon Dec 2 13:30:13 PST 2013


Thanks Juha. Committed to master.

Is this worth cherry-picking to the 1.3 stable branch and cutting a new
release sometime soon?

On 11/27/2013 11:50 PM, Juha-Pekka Heikkila wrote:
> Changes in Android Kitkat required one extra include file to allow
> using ANativeWindow.
>
> Signed-off-by: Juha-Pekka Heikkila <juha-pekka.heikkila at linux.intel.com>
> ---
>   src/waffle/android/droid_surfaceflingerlink.cpp | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/src/waffle/android/droid_surfaceflingerlink.cpp b/src/waffle/android/droid_surfaceflingerlink.cpp
> index f98d493..6a12fd1 100644
> --- a/src/waffle/android/droid_surfaceflingerlink.cpp
> +++ b/src/waffle/android/droid_surfaceflingerlink.cpp
> @@ -25,6 +25,7 @@
>
>   #if WAFFLE_ANDROID_MAJOR_VERSION >= 4 && \
>   	WAFFLE_ANDROID_MINOR_VERSION >= 1
> +#	include <gui/Surface.h>
>   #	include <gui/SurfaceComposerClient.h>
>   #elif WAFFLE_ANROID_MAJOR_VERSION >= 4 && \
>   	  WAFFLE_ANDROID_MINOR_VERSION == 0
>



More information about the waffle mailing list