aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJP Sugarbroad <jpsugar@google.com>2018-07-25 15:06:10 -0700
committerJP Sugarbroad <jpsugar@google.com>2018-08-28 13:25:00 -0700
commit3b166ce40a02156849db92db6f436cf295c68f25 (patch)
tree624b69cc4392764f3fa7d23ed75680d0d1498d6a
parent0d8f6ef0c3652de4a4b18dfa8f9b012781140ba4 (diff)
downloadplatform_build_kati-3b166ce40a02156849db92db6f436cf295c68f25.tar.gz
platform_build_kati-3b166ce40a02156849db92db6f436cf295c68f25.tar.bz2
platform_build_kati-3b166ce40a02156849db92db6f436cf295c68f25.zip
Support git submodules in version.cc generation.
Bug: 109817231 Change-Id: I52520c01ee0e2ff452ef12e7fd49ee287d6cb369
-rw-r--r--Makefile.ckati4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.ckati b/Makefile.ckati
index 377e36d..0200a9d 100644
--- a/Makefile.ckati
+++ b/Makefile.ckati
@@ -101,9 +101,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 :=