diff mbox

[i-g-t] Demos/Android.mk: build intel_sprite_on

Message ID 1418813051-3171-1-git-send-email-tim.gore@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

tim.gore@intel.com Dec. 17, 2014, 10:44 a.m. UTC 
From: Tim Gore <tim.gore@intel.com>

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@intel.com>
---
 demos/Android.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Daniel Vetter Dec. 17, 2014, 8:54 p.m. UTC | #1 
On Wed, Dec 17, 2014 at 10:44:11AM +0000, tim.gore@intel.com wrote:
> From: Tim Gore <tim.gore@intel.com>
> 
> 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@intel.com>

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@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

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)
 
 #================#