From 71809ee7f63229d0ea4f6169922ddfbfee330fd2 Mon Sep 17 00:00:00 2001
From: Adam Lesinski <adamlesinski@google.com>
Date: Mon, 18 Aug 2014 14:06:38 -0700
Subject: [PATCH] Include build number in aapt version

Teams are constantly confused over which version of aapt
they are running. Include the build number from the
Android build system in the binary. Can be retrieved by executing
'aapt version'.

Change-Id: Ie4692fb160c7cbe720a8e76b73e435170214fe0e
---
 tools/aapt/Android.mk  | 1 +
 tools/aapt/Command.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk
index 700afa1d570d7..6a5d06e6c3d15 100644
--- a/tools/aapt/Android.mk
+++ b/tools/aapt/Android.mk
@@ -91,6 +91,7 @@ LOCAL_C_INCLUDES += $(aaptCIncludes)
 
 LOCAL_CFLAGS += -Wno-format-y2k
 LOCAL_CFLAGS += -DSTATIC_ANDROIDFW_FOR_TOOLS
+LOCAL_CFLAGS += -DAAPT_VERSION=\"$(BUILD_NUMBER)\"
 ifeq (darwin,$(HOST_OS))
 LOCAL_CFLAGS += -D_DARWIN_UNLIMITED_STREAMS
 endif
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index 5d146d65bded4..fa2bacdc269bb 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -32,7 +32,7 @@ int doVersion(Bundle* bundle)
     if (bundle->getFileSpecCount() != 0) {
         printf("(ignoring extra arguments)\n");
     }
-    printf("Android Asset Packaging Tool, v0.2\n");
+    printf("Android Asset Packaging Tool, v0.2-" AAPT_VERSION "\n");
 
     return 0;
 }