aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2019-04-16 22:16:14 +0000
committerandroid-build-prod (mdb) <android-build-team-robot@google.com>2019-04-16 22:16:14 +0000
commit856e6e0495b540075facc0f407269115d882b4dc (patch)
tree693c3a9b063ea42a57fb27995f58ff91faff9369
parent0d2f8d91af2278db33eb30a56557f67b4dde326e (diff)
parenteb1899ca38d63c1719d130eafbf625ff8bc37333 (diff)
downloadkati-856e6e0495b540075facc0f407269115d882b4dc.tar.gz
Snap for 5475808 from eb1899ca38d63c1719d130eafbf625ff8bc37333 to sdk-release
Change-Id: I634ec56ec4620b5477514906f7ea31e450a32292
-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 :=