diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2020-06-29 16:42:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-29 16:42:59 -0700 |
| commit | 06a798c4db92ec3a3a6b3a4b52026f002002affa (patch) | |
| tree | f6fc1a0ef93fc7bb278fea12e1830cebe4c72e2f | |
| parent | 09477a6fb38756a1177e27916d6d8420f49a03a2 (diff) | |
| parent | 0ca84cd97acdf6d1874108984530e65ce20fa62a (diff) | |
| download | platform_build_kati-06a798c4db92ec3a3a6b3a4b52026f002002affa.tar.gz platform_build_kati-06a798c4db92ec3a3a6b3a4b52026f002002affa.tar.bz2 platform_build_kati-06a798c4db92ec3a3a6b3a4b52026f002002affa.zip | |
Merge pull request #201 from danw/android
Merge changes from AOSP
| -rw-r--r-- | Makefile.ckati | 4 | ||||
| -rw-r--r-- | src/Android.bp | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.ckati b/Makefile.ckati index 528f56f..6d45095 100644 --- a/Makefile.ckati +++ b/Makefile.ckati @@ -102,10 +102,10 @@ $(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`) KATI_VERSION_DEPS := ifneq ($(KATI_GIT_DIR),) -KATI_VERSION_DEPS := $(wildcard $(KATI_GIT_DIR)/.git/HEAD $(KATI_GIT_DIR)/.git/index) +KATI_VERSION_DEPS := $(wildcard $(KATI_GIT_DIR)/HEAD $(KATI_GIT_DIR)/index) endif ifneq ($(KATI_VERSION_DEPS),) KATI_VERSION := $(shell git -C $(KATI_GIT_DIR) rev-parse HEAD) diff --git a/src/Android.bp b/src/Android.bp index ebbef98..149d170 100644 --- a/src/Android.bp +++ b/src/Android.bp @@ -68,6 +68,11 @@ cc_binary_host { defaults: ["ckati_defaults"], srcs: ["main.cc"], whole_static_libs: ["libckati"], + target: { + linux_glibc: { + shared_libs: ["libjemalloc"], + }, + }, } cc_binary_host { |