aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-10-02 22:10:29 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-10-02 22:10:29 +0000
commit2a49513da00436f434281a98dfb118db855db013 (patch)
tree091b145e4dfc528c089aacd869438ce66116d6b4
parentec7c40a97a07acadd78d93dd8d9f2c8d361513ef (diff)
parentd019345012951498cda181caed55908f7fe4f801 (diff)
downloadkati-2a49513da00436f434281a98dfb118db855db013.tar.gz
Snap for 5044688 from d019345012951498cda181caed55908f7fe4f801 to pi-qpr2-releaseandroid-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31pie-qpr2-release
Change-Id: I9ff9646d6c8e32350523590b37b91de6854ed3a0
-rw-r--r--Makefile.ckati4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.ckati b/Makefile.ckati
index e4067bb..5bc7c9d 100644
--- a/Makefile.ckati
+++ b/Makefile.ckati
@@ -102,9 +102,9 @@ $(KATI_CXX_TEST_EXES): $(KATI_BIN_PATH)/%: $(KATI_INTERMEDIATES_PATH)/%.o
$(KATI_LD) $^ -o $@ $(KATI_LIBS)
# Rule to generate version.cc
-KATI_GIT_DIR := $(shell git -C $(KATI_SRC_PATH) rev-parse --show-toplevel)
+KATI_GIT_DIR := $(shell cd $(KATI_SRC_PATH); realpath `git rev-parse --git-dir`)
ifneq ($(KATI_GIT_DIR),)
-KATI_VERSION_DEPS := $(KATI_GIT_DIR)/.git/HEAD $(KATI_GIT_DIR)/.git/index
+KATI_VERSION_DEPS := $(KATI_GIT_DIR)/HEAD $(KATI_GIT_DIR)/index
KATI_VERSION := $(shell git -C $(KATI_GIT_DIR) rev-parse HEAD)
else
KATI_VERSION_DEPS :=