[Intel-gfx] [PATCH i-g-t v3] Android.mk: Disable tools that do not build for android

[Morton, Derek J]

>
>
>-----Original Message-----
>From: Daniel Vetter [mailto:daniel.vetter at ffwll.ch] On Behalf Of Daniel Vetter
>Sent: Tuesday, July 21, 2015 7:54 AM
>To: Morton, Derek J
>Cc: Wood, Thomas; Intel Graphics Development
>Subject: Re: [Intel-gfx] [PATCH i-g-t v3] Android.mk: Disable tools that do not build for android
>
>On Fri, Jul 17, 2015 at 03:42:34PM +0000, Morton, Derek J wrote:
>> >
>> >
>> >-----Original Message-----
>> >From: Thomas Wood [mailto:thomas.wood at intel.com]
>> >Sent: Friday, July 17, 2015 3:18 PM
>> >To: Morton, Derek J
>> >Cc: Intel Graphics Development
>> >Subject: Re: [PATCH i-g-t v3] Android.mk: Disable tools that do not 
>> >build for android
>> >
>> >On 17 July 2015 at 10:15, Derek Morton <derek.j.morton at intel.com> wrote:
>> >> Disable the tools / demo code that do not currently build for 
>> >> android until they can be fixed.
>> >>
>> >> Affected tools / demos
>> >> intel_display_crc
>> >> intel_sprite_on
>> >>
>> >> v2: intel_display_crc compiled conditionally on ANDROID_HAS_CAIRO 
>> >> flag.
>> >> v3: removed intel_reg from the skip list as Thomas has prepared a 
>> >> patch to fix it for Android.
>> >>
>> >> Signed-off-by: Derek Morton <derek.j.morton at intel.com>
>> >> ---
>> >>  Android.mk       | 2 +-
>> >>  tools/Android.mk | 4 ++++
>> >>  2 files changed, 5 insertions(+), 1 deletion(-)
>> >>
>> >> diff --git a/Android.mk b/Android.mk index 1ab3e64..681d114 100644
>> >> --- a/Android.mk
>> >> +++ b/Android.mk
>> >> @@ -1,2 +1,2 @@
>> >> -include $(call all-named-subdir-makefiles, lib tests tools 
>> >> benchmarks
>> >> demos)
>> >> +include $(call all-named-subdir-makefiles, lib tests tools
>> >> +benchmarks)
>> >
>> >This essentially just disables building intel_sprite_on. Does the comment in commit 6999b70 no longer apply?
>> >
>> With this patch the IGT automatic build test would not need to apply the patch referred to in commit 6999b70. That local patch would still be required by anyone wishing to build intel_sprite_on for android.
>> 
>> This patch is aimed at reducing friction by making the vanilla IGT code build for android as the local patch referred to is not considered upstreamable.
>
>Then just please remove intel_sprite_on - that tool is only in igt because android teams have written it, on upstream we have piles of proper igt testcases. No point in carrying around dead code.

The code is not dead. It is just dependant on a patch which cannot be upstreamed. When that patch is applied locally it builds and runs fine. As intel_sprite_on does not build for android without the patch it needs to be disabled by default as cairo dependant tests are also disabled.

>-Daniel
>--
>Daniel Vetter
>Software Engineer, Intel Corporation
>http://blog.ffwll.ch
>