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