diff options
| author | JP Sugarbroad <jpsugar@google.com> | 2018-09-07 15:01:50 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-09-07 15:01:50 -0700 |
| commit | d019345012951498cda181caed55908f7fe4f801 (patch) | |
| tree | 091b145e4dfc528c089aacd869438ce66116d6b4 | |
| parent | ec7c40a97a07acadd78d93dd8d9f2c8d361513ef (diff) | |
| parent | 181207ea02e4baaad1b3cd97dfc4fcf856341c62 (diff) | |
| download | android_build_kati-d019345012951498cda181caed55908f7fe4f801.tar.gz android_build_kati-d019345012951498cda181caed55908f7fe4f801.tar.bz2 android_build_kati-d019345012951498cda181caed55908f7fe4f801.zip | |
[automerger] Support git submodules in version.cc generation. am: 3b166ce40a am: 7f45c35f91 am: 52f19a1dd5 am: d339032ec9 am: d5bc270755 am: d04a70ea7f am: 23b67dc9ed
am: 181207ea02
Change-Id: I0596c104bafc534af0989eca266fcd8b006adf1c
| -rw-r--r-- | Makefile.ckati | 4 |
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 := |