| Message ID | 1437122651-32658-1-git-send-email-derek.j.morton@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
> > >-----Original Message----- >From: Morton, Derek J >Sent: Friday, July 17, 2015 9:44 AM >To: intel-gfx@lists.freedesktop.org >Cc: Wood, Thomas; Morton, Derek J >Subject: [PATCH i-g-t v3] 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. > >Signed-off-by: Derek Morton <derek.j.morton@intel.com> >--- > Android.mk | 2 +- > tools/Android.mk | 5 +++++ > 2 files changed, 6 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..4be0032 100644 >--- a/tools/Android.mk >+++ b/tools/Android.mk >@@ -37,10 +37,15 @@ endef > > skip_tools_list := \ > intel_framebuffer_dump \ >+ intel_reg \ That's weird, git diff HEAD^ shows this being removed but git format-patch HEAD^ has left it in. > intel_reg_dumper \ > 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)))) >-- >1.9.1 > >
On 17/07/15 09:53, Morton, Derek J wrote: >> >> >> -----Original Message----- >> From: Morton, Derek J >> Sent: Friday, July 17, 2015 9:44 AM >> To: intel-gfx@lists.freedesktop.org >> Cc: Wood, Thomas; Morton, Derek J >> Subject: [PATCH i-g-t v3] 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. >> >> Signed-off-by: Derek Morton <derek.j.morton@intel.com> >> --- >> Android.mk | 2 +- >> tools/Android.mk | 5 +++++ >> 2 files changed, 6 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..4be0032 100644 >> --- a/tools/Android.mk >> +++ b/tools/Android.mk >> @@ -37,10 +37,15 @@ endef >> >> skip_tools_list := \ >> intel_framebuffer_dump \ >> + intel_reg \ > > That's weird, git diff HEAD^ shows this being removed but git format-patch HEAD^ has left it in. The relevant man pages say: git diff [--options] <commit> [--] [<path>...] This form is to view the changes you have in your working tree relative to the named <commit>. You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch. git format-patch [-k] [(-o|--output-directory) <dir> | --stdout] ... [<common diff options>] [ <since> | <revision range> ] So "git format-patch HEAD^" is describing the changes between HEAD^ and HEAD i.e. 'since' == HEAD^, equivalent to revision range "HEAD^..HEAD" Whereas "git diff HEAD^" is comparing the commit referenced by "HEAD^" with the current working tree (which might differ from HEAD). They'll be different if you have uncommitted changes in your working tree! .Dave.
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..4be0032 100644 --- a/tools/Android.mk +++ b/tools/Android.mk @@ -37,10 +37,15 @@ endef skip_tools_list := \ intel_framebuffer_dump \ + intel_reg \ intel_reg_dumper \ 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))))
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@intel.com> --- Android.mk | 2 +- tools/Android.mk | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)