diff options
| author | Greg Hartman <ghartman@google.com> | 2019-07-22 07:43:34 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-22 07:43:34 -0700 |
| commit | 74512c6163f15a735e56d3b882278975b8fd14af (patch) | |
| tree | 2db737e6d9c8c2c71cfec811d9c40d83cb4da97e | |
| parent | 479143bb2fc26e4e24e4271bcf17a8b399a0955f (diff) | |
| parent | c78fc4e3d23413868c003e673ec933e1947096a5 (diff) | |
| download | mesa3d-74512c6163f15a735e56d3b882278975b8fd14af.tar.gz | |
Merge "Reapply fix for the git version header"
am: c78fc4e3d2
Change-Id: I5e6a94e0581140468544d38b3a1918c78781a02d
| -rw-r--r-- | src/mesa/Android.libmesa_git_sha1.mk | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/mesa/Android.libmesa_git_sha1.mk b/src/mesa/Android.libmesa_git_sha1.mk index 7f5ed6b01d1..fbbbf2fe094 100644 --- a/src/mesa/Android.libmesa_git_sha1.mk +++ b/src/mesa/Android.libmesa_git_sha1.mk @@ -43,15 +43,10 @@ $(intermediates)/dummy.c: LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, git_sha1.h) -$(intermediates)/git_sha1.h: +$(intermediates)/git_sha1.h: $(wildcard $(MESA_TOP)/.git/logs/HEAD) @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 + $(hide) $(MESA_PYTHON2) $(MESA_TOP)/bin/git_sha1_gen.py --output $@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) |