diff options
| author | JP Sugarbroad <jpsugar@google.com> | 2018-09-07 14:57:48 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-09-07 14:57:48 -0700 |
| commit | 181207ea02e4baaad1b3cd97dfc4fcf856341c62 (patch) | |
| tree | 4e2b4810cece6a3f3c44be0a0a0619bc6eb6af12 | |
| parent | 7bf55111d20e2cde9f64af5c874864777b4aa057 (diff) | |
| parent | 23b67dc9ed3f89a7b6cf601d61dffa15bd9e8614 (diff) | |
| download | android_build_kati-181207ea02e4baaad1b3cd97dfc4fcf856341c62.tar.gz android_build_kati-181207ea02e4baaad1b3cd97dfc4fcf856341c62.tar.bz2 android_build_kati-181207ea02e4baaad1b3cd97dfc4fcf856341c62.zip | |
[automerger] Support git submodules in version.cc generation. am: 3b166ce40a am: 7f45c35f91 am: 52f19a1dd5 am: d339032ec9 am: d5bc270755 am: d04a70ea7f
am: 23b67dc9ed
Change-Id: Ic085da4146908f6e9df35dd99121f8788d876049
| -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 := |