diff options
| author | Mauro Rossi <[email protected]> | 2017-06-06 23:28:33 +0200 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-06-15 15:46:44 +0100 |
| commit | d5523d912cbeb325c587453c790315696bfb0c7e (patch) | |
| tree | f150e54c92b3b997677f3fc31e21ec663f7acde6 /src/mesa/Android.gen.mk | |
| parent | 5d87667fed1bd5ab850abdfb3a10db8c8c21c330 (diff) | |
svga: fix git_sha1.h include path in Android.mk (v3)
Adds libmesa_git_sha1 static (dummy) library to generate git_sha1.h
with some polishing to header dependency on .git/HEAD and scripted rules.
The now redundant generation rules are removed from Android.gen.mk
libmesa_git_sha1 whole static depedency is added to libmesa_pipe_svga,
libmesa_dricore and libmesa_st_mesa modules
Fixes the following building error:
external/mesa/src/gallium/drivers/svga/svga_screen.c:26:10:
fatal error: 'git_sha1.h' file not found
^
1 error generated.
Fixes: 1ce3a27 ("svga: Add the ability to log messages to
vmware.log on the host.")
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/mesa/Android.gen.mk')
| -rw-r--r-- | src/mesa/Android.gen.mk | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/mesa/Android.gen.mk b/src/mesa/Android.gen.mk index 42d4ba19691..366a6b1036e 100644 --- a/src/mesa/Android.gen.mk +++ b/src/mesa/Android.gen.mk @@ -53,8 +53,6 @@ LOCAL_C_INCLUDES += $(intermediates)/x86 endif endif -sources += main/git_sha1.h - sources := $(addprefix $(intermediates)/, $(sources)) LOCAL_GENERATED_SOURCES += $(sources) @@ -71,16 +69,6 @@ define es-gen $(hide) $(PRIVATE_SCRIPT) $(1) $(PRIVATE_XML) > $@ endef -$(intermediates)/main/git_sha1.h: - @mkdir -p $(dir $@) - @echo "GIT-SHA1: $(PRIVATE_MODULE) <= git" - $(hide) touch $@ - $(hide) if which git > /dev/null; then \ - git --git-dir $(PRIVATE_PATH)/../../.git log -n 1 --oneline | \ - sed 's/^\([^ ]*\) .*/#define MESA_GIT_SHA1 "git-\1"/' \ - > $@; \ - fi - matypes_deps := \ $(BUILD_OUT_EXECUTABLES)/mesa_gen_matypes$(BUILD_EXECUTABLE_SUFFIX) \ $(LOCAL_PATH)/main/mtypes.h \ |