On Wed, Dec 17, 2014 at 10:44:11AM +0000, tim.gore@xxxxxxxxx wrote: > From: Tim Gore <tim.gore@xxxxxxxxx> > > This reverts the effect of two commits > 06fb6c233dd82aac766aa9206644f6eff668ca99 > 264e1ac10ac14a098a78cc9f96c4e7cabb124ee5 > > Both of these were to stop demos/intel_sprite_on > from being built, but the first was just broken. > > So this commit re-enables building intel_sprite_on. > However, intel_sprite_on will not build in recent > Android trees. To overcome this the version > of IGT kept in the Android repository will carry a patch > to intel_sprite_on, and the automatic build test of > IGT on android will patch the freedesktop code on the fly. > > Signed-off-by: Tim Gore <tim.gore@xxxxxxxxx> Merged, thanks. -Daniel > --- > demos/Android.mk | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/demos/Android.mk b/demos/Android.mk > index 5a00116..7d06c9a 100644 > --- a/demos/Android.mk > +++ b/demos/Android.mk > @@ -23,7 +23,6 @@ LOCAL_STATIC_LIBRARIES := libintel_gpu_tools > > LOCAL_SHARED_LIBRARIES := libdrm > > -# This demo (intel_sprite_on.c) wont build on android > -#include $(BUILD_EXECUTABLE) > +include $(BUILD_EXECUTABLE) > > #================# > -- > 2.1.3 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
