diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-08-28 20:25:18 +0000 |
|---|---|---|
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-08-28 20:25:18 +0000 |
| commit | d5bc270755fe8e17ff9611a83a46eab9dabb6eff (patch) | |
| tree | 624b69cc4392764f3fa7d23ed75680d0d1498d6a | |
| parent | 0d8f6ef0c3652de4a4b18dfa8f9b012781140ba4 (diff) | |
| parent | d339032ec9ec9f1b63833cdf15e8da7536d6b1ad (diff) | |
| download | android_build_kati-d5bc270755fe8e17ff9611a83a46eab9dabb6eff.tar.gz android_build_kati-d5bc270755fe8e17ff9611a83a46eab9dabb6eff.tar.bz2 android_build_kati-d5bc270755fe8e17ff9611a83a46eab9dabb6eff.zip | |
[automerger] Support git submodules in version.cc generation. am: 3b166ce40a am: 7f45c35f91 am: 52f19a1dd5 am: d339032ec9
Change-Id: I245bb5b2978a8eba6998394839c4a08f97d7203e
| -rw-r--r-- | Makefile.ckati | 4 |
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 := |