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

Juha-Pekka Heikkilä juha-pekka.heikkila at linux.intel.com
Tue Dec 3 00:30:06 PST 2013


Cherry-picking this patch probably makes sense since Waffle will not
compile without this from 4.3 Android onwards.

/Juha-Pekka

On Mon, December 2, 2013 11:30 pm, Chad Versace wrote:
> 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
>>
>
> _______________________________________________
> waffle mailing list
> waffle at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/waffle
>



More information about the waffle mailing list