From 30239937e7722ca376864d888cc2edaca21a496d Mon Sep 17 00:00:00 2001 From: Sascha Haeberling Date: Wed, 28 Aug 2013 14:51:53 -0700 Subject: Automatic versioning for Camera. Bug: 10461009 This is the scheme copied from GMS Core and modified by Babel, which allows us to generate version number more easily and also incorporate build numbers into it. Change-Id: I6ed4bf03e545a22423cb9936a5fcb67a50133490 --- Android.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index a77ae822e..17160e994 100644 --- a/Android.mk +++ b/Android.mk @@ -14,7 +14,12 @@ LOCAL_SRC_FILES += $(call all-java-files-under, src_pd) LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res -LOCAL_AAPT_FLAGS := --auto-add-overlay + +include $(LOCAL_PATH)/version.mk +LOCAL_AAPT_FLAGS := \ + --auto-add-overlay \ + --version-name "$(version_name_package)" \ + --version-code $(version_code_package) \ LOCAL_PACKAGE_NAME := Camera2 @@ -24,4 +29,4 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags include $(BUILD_PACKAGE) -include $(call all-makefiles-under, $(LOCAL_PATH)) \ No newline at end of file +include $(call all-makefiles-under, $(LOCAL_PATH)) -- cgit v1.2.3