summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorSascha Haeberling <haeberling@google.com>2013-08-28 21:51:53 (GMT)
committerSascha Haeberling <haeberling@google.com>2013-08-28 22:00:18 (GMT)
commit30239937e7722ca376864d888cc2edaca21a496d (patch)
treeaa5a9277fd8254524979675adec6d5479db9f466 /Android.mk
parent18d1d26a6da997bc0d9aa4d5688203f36c15377a (diff)
downloadandroid_packages_apps_Snap-30239937e7722ca376864d888cc2edaca21a496d.zip
android_packages_apps_Snap-30239937e7722ca376864d888cc2edaca21a496d.tar.gz
android_packages_apps_Snap-30239937e7722ca376864d888cc2edaca21a496d.tar.bz2
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
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk9
1 files changed, 7 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index a77ae82..17160e9 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))