Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4b9b84c5: am f611c1b5: Merge "Revert "Include build number in aapt version"" into lmp-dev

Browse Source 
* commit '4b9b84c5db6b0b6ba629cf64bc894016fe2cf0c1':
  Revert "Include build number in aapt version"
This commit is contained in:
Adam Lesinski
2014-08-18 23:16:26 +00:00
committed by Android Git Automerger
parent 7515b942a8 814a6751cf
commit 5da86bc21a
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/aapt/Android.mk
View File

@@ -91,7 +91,6 @@ 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

2
tools/aapt/Command.cpp
View File

@@ -32,7 +32,7 @@ int doVersion(Bundle* bundle)
if (bundle->getFileSpecCount() != 0) {
printf("(ignoring extra arguments)\n");
}
printf("Android Asset Packaging Tool, v0.2-" AAPT_VERSION "\n");
printf("Android Asset Packaging Tool, v0.2\n");
return 0;
}