Skip to contentSkip to conversation

Demos/Android.mk: build intel_sprite_on

PATCH Applied [email protected] 2 participants 2 messages Dec 17, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Demos/Android.mk: build intel_sprite_on

From: Tim Gore <[email protected]>

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.

---
 demos/Android.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
demos/Android.mk +1 -2
index 5a00116..7d06c9a 100644
@@ -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)
 
 #================#
Signature · 6 lines
2.1.3

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw
Quoted 9 lines · On Wed, Dec 17, 2014 at 10:44:11AM +0000, [email protected] wrote:

From: Tim Gore <[email protected]>

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.

Quoted 8 lines

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.

Merged, thanks.
-Daniel

Quoted 24 lines
---
 demos/Android.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
demos/Android.mk +1 -2
index 5a00116..7d06c9a 100644
@@ -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)
 
 #================#
Signature · 6 lines
2.1.3

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx