Merge remote-tracking branch 'aosp/upstream' into master

* aosp/upstream:
  Implement "phony_output" feature in ninja

Test: treehugger
Change-Id: Ia22358ec998b1ab2a808038dafb9827d5dd09d2d
diff --git a/Android.bp b/Android.bp
index ebbef98..149d170 100644
--- a/Android.bp
+++ b/Android.bp
@@ -68,6 +68,11 @@
     defaults: ["ckati_defaults"],
     srcs: ["main.cc"],
     whole_static_libs: ["libckati"],
+    target: {
+        linux_glibc: {
+            shared_libs: ["libjemalloc"],
+        },
+    },
 }
 
 cc_binary_host {
diff --git a/Makefile.ckati b/Makefile.ckati
index 6337590..0984c4e 100644
--- a/Makefile.ckati
+++ b/Makefile.ckati
@@ -102,9 +102,9 @@
 	$(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 :=
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..d480f59
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,3 @@
+ccross@android.com
+dwillemsen@google.com
+hamaji@google.com