Skip to contentSkip to conversation

Android.mk: Disable tools that do not build for android

PATCH In review Derek Morton 4 participants 6 messages Jul 17, 2015 – Jul 21, 2015

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 Android.mk: Disable tools that do not build for android

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.

---
 Android.mk       | 2 +-
 tools/Android.mk | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
Android.mk +1 -1
index 1ab3e64..681d114 100644
@@ -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)
 
tools/Android.mk +4 -0
index 39f4512..b5f8008 100644
@@ -41,6 +41,10 @@ skip_tools_list := \
     intel_vga_read \
     intel_vga_write
 
+ifneq ("${ANDROID_HAS_CAIRO}", "1")
+    skip_tools_list += intel_display_crc
+endif
+
 tools_list := $(filter-out $(skip_tools_list),$(bin_PROGRAMS))
 
 $(foreach item,$(tools_list),$(eval $(call add_tool,$(item))))
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw
Quoted 23 lines · Derek Morton

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.

---
 Android.mk       | 2 +-
 tools/Android.mk | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
Android.mk +0 -0
index 1ab3e64..681d114 100644

Android.mk line 1

Quoted 2 lines
Android.mk +1 -1
@@ -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?

Quoted 17 lines
tools/Android.mk +4 -1
index 39f4512..b5f8008 100644
@@ -41,6 +41,10 @@ skip_tools_list := \
     intel_vga_read \
     intel_vga_write
 
+ifneq ("${ANDROID_HAS_CAIRO}", "1")
+    skip_tools_list += intel_display_crc
+endif
+
 tools_list := $(filter-out $(skip_tools_list),$(bin_PROGRAMS))
 
 $(foreach item,$(tools_list),$(eval $(call add_tool,$(item))))
--
Quoted 2 lines

1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw
Quoted 28 lines

-----Original Message-----
From: Thomas Wood [mailto:[email protected]]
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

Quoted 18 lines · Derek Morton

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.

---
 Android.mk       | 2 +-
 tools/Android.mk | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
Quoted 12 lines

Android.mk

Quoted 9 lines
Android.mk +2 -1
index 1ab3e64..681d114 100644
@@ -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.

//Derek

Quoted 15 lines
Quoted 15 lines
tools/Android.mk index renamed from tools/Android.mk +0 -0

39f4512..b5f8008 100644

tools/Android.mk +3 -0
@@ -41,6 +41,10 @@ skip_tools_list := \
     intel_vga_read \
     intel_vga_write
 
+ifneq ("${ANDROID_HAS_CAIRO}", "1")
+    skip_tools_list += intel_display_crc endif
+
 tools_list := $(filter-out $(skip_tools_list),$(bin_PROGRAMS))
 
Quoted 5 lines
Quoted 4 lines
tools/Android.mk +0 -1
 $(foreach item,$(tools_list),$(eval $(call add_tool,$(item))))
--

1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw
Quoted 40 lines · Derek J
Quoted 28 lines

-----Original Message-----
From: Thomas Wood [mailto:[email protected]]
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

Quoted 18 lines · Derek Morton

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.

---
 Android.mk       | 2 +-
 tools/Android.mk | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
Quoted 12 lines

Android.mk

Quoted 9 lines
Android.mk +2 -1
index 1ab3e64..681d114 100644
@@ -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?

Quoted 3 lines

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.
-Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw
Quoted 51 lines

-----Original Message-----
From: Daniel Vetter [mailto:[email protected]] 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

Quoted 41 lines · Derek J
Quoted 41 lines

-----Original Message-----
From: Thomas Wood [mailto:[email protected]]
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

Quoted 25 lines · Derek Morton

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.

---
 Android.mk       | 2 +-
 tools/Android.mk | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
Android.mk +0 -1
@@ -1,2 +1,2 @@
-include $(call all-named-subdir-makefiles, lib tests tools 

benchmarks
demos)

Android.mk

Quoted 2 lines
Android.mk +2 -0
+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?

Quoted 5 lines
Quoted 3 lines

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.

Quoted 6 lines

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

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw
In reply to Daniel Vetter

Tim Gore
Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ

Quoted 57 lines

-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Daniel Vetter
Sent: Tuesday, July 21, 2015 7:54 AM
To: Morton, Derek J
Cc: Intel Graphics Development; Wood, Thomas
Subject: Re: [Intel-gfx] [PATCH i-g-t v3] Android.mk: Disable tools that do not build for android

Quoted 11 lines · Derek J
Quoted 11 lines

-----Original Message-----
From: Thomas Wood [mailto:[email protected]]
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 <[email protected]>

Quoted 18 lines · wrote:
Quoted 18 lines
Quoted 18 lines

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.

---
 Android.mk       | 2 +-
 tools/Android.mk | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
Quoted 11 lines
Quoted 11 lines

Android.mk

Quoted 9 lines
Android.mk +0 -1
@@ -1,2 +1,2 @@
-include $(call all-named-subdir-makefiles, lib tests tools

benchmarks
demos)

Android.mk +2 -0
+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?

Quoted 2 lines
Quoted 1 line

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.

Quoted 1 line
Quoted 8 lines
Quoted 1 line

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.
-Daniel
--

I don’t think this code is dead, it just uses some features which require a tweak when building for android. (I believe it builds fine for linux). Its not really intended to be a "test" I don’t think, just a quick sanity check that the basics are there.

Tim

Quoted 7 lines

Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx