am bbcc914b: am 01efd7e8: Merge "Use build_number from file"

* commit 'bbcc914b18a5b2ea57e25e6e79336c5c75d49421':
  Use build_number from file
This commit is contained in:
Colin Cross
2015-07-23 19:11:22 +00:00
committed by Android Git Automerger

View File

@@ -64,7 +64,7 @@ aaptHostStaticLibs := \
libziparchive-host \
libbase
aaptCFlags := -DAAPT_VERSION=\"$(BUILD_NUMBER)\"
aaptCFlags := -DAAPT_VERSION=\"$(BUILD_NUMBER_FROM_FILE)\"
aaptCFlags += -Wall -Werror
ifeq ($(HOST_OS),linux)