Merge changes Ia3bcece1,Icd26dc1e

* changes:
  Don't compile libaapt with the build number
  aapt: Always use our libz

1 files changed, 0 insertions, 18 deletions

diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index ba731801e507..5e8580255197 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -29,24 +29,6 @@
 
 using namespace android;
 
-#ifndef AAPT_VERSION
-    #define AAPT_VERSION ""
-#endif
-
-/*
- * Show version info.  All the cool kids do it.
- */
-int doVersion(Bundle* bundle)
-{
-    if (bundle->getFileSpecCount() != 0) {
-        printf("(ignoring extra arguments)\n");
-    }
-    printf("Android Asset Packaging Tool, v0.2-" AAPT_VERSION "\n");
-
-    return 0;
-}
-
-
 /*
  * Open the file read only.  The call fails if the file doesn't exist.
  *