diff options
| author | Tim Gore <tim.gore@intel.com> | 2014-12-17 10:44:11 +0000 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-12-17 21:53:34 +0100 |
| commit | 6999b70a8438789c3afaad0cb76cf364bd4274c1 (patch) | |
| tree | e50f855d63a2450a7c5b2225a048935b13c33f2b /demos | |
| parent | f73697aa8b9131f4bbcd438c66d45b24254d92c7 (diff) | |
Demos/Android.mk: build intel_sprite_on
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>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/Android.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/demos/Android.mk b/demos/Android.mk index 5a00116f..7d06c9af 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) #================# |