Merge "Update strace update docs, fix strace -V."
am: 6ae3ff4383
Change-Id: I85fc966c578910f7c9128f0256a6a990dbc3b491
diff --git a/Android.mk b/Android.mk
index 5bf9ca7..86f6bae 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,18 +20,14 @@
# To update:
#
-# git remote add strace git://git.code.sf.net/p/strace/code
-# git fetch strace
-# git merge strace/master
-# ./xlat/gen.sh
+# repo sync .
+# repo start merge .
+# git merge aosp/upstream-master --no-ff # resolve any conflicts
+# ./configure && make
# mm -j32
# # (Make any necessary Android.mk changes and test the new strace.)
-# git push aosp HEAD:master # Push directly, avoiding gerrit.
-# git push aosp HEAD:refs/for/master # Push to gerrit.
-#
-# # Now commit any necessary Android.mk changes like normal:
-# repo start post-sync .
-# git commit -a
+# # Beware the .gitignore files --- xlat especially.
+# git commit -a --amend
#
# We don't currently have a good solution for the 'configure' side of things.
@@ -43,7 +39,8 @@
include $(CLEAR_VARS)
-strace_version := $(shell grep Version $(LOCAL_PATH)/strace.spec | cut -d " " -f 2)
+strace_version := $(shell grep strace $(LOCAL_PATH)/debian/changelog.in | \
+ head -2 | tail -1 | cut -d " " -f 2)
LOCAL_SRC_FILES := \
access.c \
