aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-02-12 09:53:24 -0800
committerXin Li <delphij@google.com>2019-02-12 09:53:24 -0800
commit0d3a7a2a60202245f478695c8512b74958c804ff (patch)
tree693c3a9b063ea42a57fb27995f58ff91faff9369
parentbd05e6980b90bce370c75cec5b2f7b271d119ee1 (diff)
parenta4c87794d2764b2de3d2d77a5f66fe478e907e9b (diff)
downloadkati-0d3a7a2a60202245f478695c8512b74958c804ff.tar.gz
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-mastertemp-124234733-master
Bug: 124234733 Change-Id: I55002b1b7a9c53afc4dcefafcbcb585578a493a2
-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 :=