aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-02-11 14:26:20 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-02-11 14:26:20 -0800
commitf4f43e68207d81c2f18f9b1ffb72a22feb023e3a (patch)
tree091b145e4dfc528c089aacd869438ce66116d6b4
parent17da287661100ee95f6f7b16c86afbdd78243dc5 (diff)
parenta4c87794d2764b2de3d2d77a5f66fe478e907e9b (diff)
downloadandroid_build_kati-f4f43e68207d81c2f18f9b1ffb72a22feb023e3a.tar.gz
android_build_kati-f4f43e68207d81c2f18f9b1ffb72a22feb023e3a.tar.bz2
android_build_kati-f4f43e68207d81c2f18f9b1ffb72a22feb023e3a.zip
Snap for 5180536 from 2a49513da00436f434281a98dfb118db855db013 to pi-platform-release
am: a4c87794d2 Change-Id: Id21fb12120539c20cf8be00192151daacaa6fd1e
-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 :=