diff mbox

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

Message ID 1434373499-29830-1-git-send-email-derek.j.morton@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Derek Morton June 15, 2015, 1:04 p.m. UTC
Disable the tools / demo code that do not currently build
for android until they can be fixed.

Affected tools / demos
intel_reg
intel_display_crc
intel_sprite_on

Signed-off-by: Derek Morton <derek.j.morton@intel.com>
---
 Android.mk       | 2 +-
 tools/Android.mk | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

Comments

Thomas Wood June 15, 2015, 1:08 p.m. UTC | #1
On 15 June 2015 at 14:04, Derek Morton <derek.j.morton@intel.com> wrote:
> Disable the tools / demo code that do not currently build
> for android until they can be fixed.

What needs to be fixed?


>
> Affected tools / demos
> intel_reg
> intel_display_crc
> intel_sprite_on
>
> Signed-off-by: Derek Morton <derek.j.morton@intel.com>
> ---
>  Android.mk       | 2 +-
>  tools/Android.mk | 2 ++
>  2 files changed, 3 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)
>
> diff --git a/tools/Android.mk b/tools/Android.mk
> index 39f4512..fd2800e 100644
> --- a/tools/Android.mk
> +++ b/tools/Android.mk
> @@ -36,7 +36,9 @@ endef
>  #================#
>
>  skip_tools_list := \
> +    intel_display_crc \
>      intel_framebuffer_dump \
> +    intel_reg \
>      intel_reg_dumper \
>      intel_vga_read \
>      intel_vga_write
> --
> 1.9.1
>
Derek Morton June 15, 2015, 1:19 p.m. UTC | #2
>

>-----Original Message-----

>From: Thomas Wood [mailto:thomas.wood@intel.com] 

>Sent: Monday, June 15, 2015 2:09 PM

>To: Morton, Derek J

>Cc: Intel Graphics Development; Gore, Tim

>Subject: Re: [PATCH i-g-t] Android.mk: Disable tools that do not build for android

>

>On 15 June 2015 at 14:04, Derek Morton <derek.j.morton@intel.com> wrote:

>> Disable the tools / demo code that do not currently build for android 

>> until they can be fixed.

>

>What needs to be fixed?

>


Intel_reg - Relies on a header file not provided by the Android compiler
Intel_display_crc - Cairo dependency
Intel_sprite_on - An API difference in the Android i915 driver.

//Derek

>

>>

>> Affected tools / demos

>> intel_reg

>> intel_display_crc

>> intel_sprite_on

>>

>> Signed-off-by: Derek Morton <derek.j.morton@intel.com>

>> ---

>>  Android.mk       | 2 +-

>>  tools/Android.mk | 2 ++

>>  2 files changed, 3 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)

>>

>> diff --git a/tools/Android.mk b/tools/Android.mk index 

>> 39f4512..fd2800e 100644

>> --- a/tools/Android.mk

>> +++ b/tools/Android.mk

>> @@ -36,7 +36,9 @@ endef

>>  #================#

>>

>>  skip_tools_list := \

>> +    intel_display_crc \

>>      intel_framebuffer_dump \

>> +    intel_reg \

>>      intel_reg_dumper \

>>      intel_vga_read \

>>      intel_vga_write

>> --

>> 1.9.1

>>

>
Jani Nikula June 15, 2015, 1:23 p.m. UTC | #3
On Mon, 15 Jun 2015, "Morton, Derek J" <derek.j.morton@intel.com> wrote:
>>
>>-----Original Message-----
>>From: Thomas Wood [mailto:thomas.wood@intel.com] 
>>Sent: Monday, June 15, 2015 2:09 PM
>>To: Morton, Derek J
>>Cc: Intel Graphics Development; Gore, Tim
>>Subject: Re: [PATCH i-g-t] Android.mk: Disable tools that do not build for android
>>
>>On 15 June 2015 at 14:04, Derek Morton <derek.j.morton@intel.com> wrote:
>>> Disable the tools / demo code that do not currently build for android 
>>> until they can be fixed.
>>
>>What needs to be fixed?
>>
>
> Intel_reg - Relies on a header file not provided by the Android compiler

...which one?

> Intel_display_crc - Cairo dependency
> Intel_sprite_on - An API difference in the Android i915 driver.
>
> //Derek
>
>>
>>>
>>> Affected tools / demos
>>> intel_reg
>>> intel_display_crc
>>> intel_sprite_on
>>>
>>> Signed-off-by: Derek Morton <derek.j.morton@intel.com>
>>> ---
>>>  Android.mk       | 2 +-
>>>  tools/Android.mk | 2 ++
>>>  2 files changed, 3 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)
>>>
>>> diff --git a/tools/Android.mk b/tools/Android.mk index 
>>> 39f4512..fd2800e 100644
>>> --- a/tools/Android.mk
>>> +++ b/tools/Android.mk
>>> @@ -36,7 +36,9 @@ endef
>>>  #================#
>>>
>>>  skip_tools_list := \
>>> +    intel_display_crc \
>>>      intel_framebuffer_dump \
>>> +    intel_reg \
>>>      intel_reg_dumper \
>>>      intel_vga_read \
>>>      intel_vga_write
>>> --
>>> 1.9.1
>>>
>>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Derek Morton June 15, 2015, 1:38 p.m. UTC | #4
>
>
>-----Original Message-----
>From: Jani Nikula [mailto:jani.nikula@linux.intel.com] 
>Sent: Monday, June 15, 2015 2:24 PM
>To: Morton, Derek J; Wood, Thomas
>Cc: Intel Graphics Development
>Subject: Re: [Intel-gfx] [PATCH i-g-t] Android.mk: Disable tools that do not build for android
>
>On Mon, 15 Jun 2015, "Morton, Derek J" <derek.j.morton@intel.com> wrote:
>>>
>>>-----Original Message-----
>>>From: Thomas Wood [mailto:thomas.wood@intel.com]
>>>Sent: Monday, June 15, 2015 2:09 PM
>>>To: Morton, Derek J
>>>Cc: Intel Graphics Development; Gore, Tim
>>>Subject: Re: [PATCH i-g-t] Android.mk: Disable tools that do not build 
>>>for android
>>>
>>>On 15 June 2015 at 14:04, Derek Morton <derek.j.morton@intel.com> wrote:
>>>> Disable the tools / demo code that do not currently build for 
>>>> android until they can be fixed.
>>>
>>>What needs to be fixed?
>>>
>>
>> Intel_reg - Relies on a header file not provided by the Android 
>> compiler
>
>...which one?

sys/io.h
Tim Gore has looked into this issue. The complexity in fixing is more with the licencing than technical.

//Derek

>
>> Intel_display_crc - Cairo dependency
>> Intel_sprite_on - An API difference in the Android i915 driver.
>>
>> //Derek
>>
>>>
>>>>
>>>> Affected tools / demos
>>>> intel_reg
>>>> intel_display_crc
>>>> intel_sprite_on
>>>>
>>>> Signed-off-by: Derek Morton <derek.j.morton@intel.com>
>>>> ---
>>>>  Android.mk       | 2 +-
>>>>  tools/Android.mk | 2 ++
>>>>  2 files changed, 3 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)
>>>>
>>>> diff --git a/tools/Android.mk b/tools/Android.mk index 
>>>> 39f4512..fd2800e 100644
>>>> --- a/tools/Android.mk
>>>> +++ b/tools/Android.mk
>>>> @@ -36,7 +36,9 @@ endef
>>>>  #================#
>>>>
>>>>  skip_tools_list := \
>>>> +    intel_display_crc \
>>>>      intel_framebuffer_dump \
>>>> +    intel_reg \
>>>>      intel_reg_dumper \
>>>>      intel_vga_read \
>>>>      intel_vga_write
>>>> --
>>>> 1.9.1
>>>>
>>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
>--
>Jani Nikula, Intel Open Source Technology Center
>
Daniel Vetter June 15, 2015, 1:42 p.m. UTC | #5
On Mon, Jun 15, 2015 at 01:19:16PM +0000, Morton, Derek J wrote:
> >
> >-----Original Message-----
> >From: Thomas Wood [mailto:thomas.wood@intel.com] 
> >Sent: Monday, June 15, 2015 2:09 PM
> >To: Morton, Derek J
> >Cc: Intel Graphics Development; Gore, Tim
> >Subject: Re: [PATCH i-g-t] Android.mk: Disable tools that do not build for android
> >
> >On 15 June 2015 at 14:04, Derek Morton <derek.j.morton@intel.com> wrote:
> >> Disable the tools / demo code that do not currently build for android 
> >> until they can be fixed.
> >
> >What needs to be fixed?
> >
> 
> Intel_reg - Relies on a header file not provided by the Android compiler
> Intel_display_crc - Cairo dependency

Cairo should be available by now on android, at least on some builds. The
test at least go to great pains to build if cairo is around. Imo we should
adopt it.

> Intel_sprite_on - An API difference in the Android i915 driver.

This tool is only around for the benefit of the android display folks. If
you dont need it then it's time to remove it.
-Daniel
Derek Morton June 15, 2015, 2:08 p.m. UTC | #6
>
>
>-----Original Message-----
>From: Daniel Vetter [mailto:daniel.vetter@ffwll.ch] On Behalf Of Daniel Vetter
>Sent: Monday, June 15, 2015 2:43 PM
>To: Morton, Derek J
>Cc: Wood, Thomas; Intel Graphics Development
>Subject: Re: [Intel-gfx] [PATCH i-g-t] Android.mk: Disable tools that do not build for android
>
>On Mon, Jun 15, 2015 at 01:19:16PM +0000, Morton, Derek J wrote:
>> >
>> >-----Original Message-----
>> >From: Thomas Wood [mailto:thomas.wood@intel.com]
>> >Sent: Monday, June 15, 2015 2:09 PM
>> >To: Morton, Derek J
>> >Cc: Intel Graphics Development; Gore, Tim
>> >Subject: Re: [PATCH i-g-t] Android.mk: Disable tools that do not 
>> >build for android
>> >
>> >On 15 June 2015 at 14:04, Derek Morton <derek.j.morton@intel.com> wrote:
>> >> Disable the tools / demo code that do not currently build for 
>> >> android until they can be fixed.
>> >
>> >What needs to be fixed?
>> >
>> 
>> Intel_reg - Relies on a header file not provided by the Android 
>> compiler Intel_display_crc - Cairo dependency
>
>Cairo should be available by now on android, at least on some builds. The test at least go to great pains to build if cairo is around. Imo we should adopt it.

Cairo is not present by default on the Gmin build. There is a CAIRO_DEPENDANT flag for building tests. I will update the patch so the tool gets built conditionally with the same flag. 

>
>> Intel_sprite_on - An API difference in the Android i915 driver.
>
>This tool is only around for the benefit of the android display folks. If you dont need it then it's time to remove it.
>-Daniel

My aim is to get the vanilla freedesktop code to build on android. Currently intel_sprit_on requires a local patch to build so needs to be disabled by default until that is resolved.

//Derek

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

Patch

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)
 
diff --git a/tools/Android.mk b/tools/Android.mk
index 39f4512..fd2800e 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -36,7 +36,9 @@  endef
 #================#
 
 skip_tools_list := \
+    intel_display_crc \
     intel_framebuffer_dump \
+    intel_reg \
     intel_reg_dumper \
     intel_vga_read \
     intel_vga_write