diff options
author | Sascha Haeberling <haeberling@google.com> | 2013-08-30 23:35:52 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-30 23:35:53 +0000 |
commit | 72a57ddf178b410ffb3c4532fc4e56b8b1d99706 (patch) | |
tree | e811b6476364a43dd3efd342b664a2f3d5dfcce4 /Android.mk | |
parent | 750e73c4a4b04a5695540d3c982774662307b58e (diff) | |
parent | 30239937e7722ca376864d888cc2edaca21a496d (diff) | |
download | android_packages_apps_Snap-72a57ddf178b410ffb3c4532fc4e56b8b1d99706.tar.gz android_packages_apps_Snap-72a57ddf178b410ffb3c4532fc4e56b8b1d99706.tar.bz2 android_packages_apps_Snap-72a57ddf178b410ffb3c4532fc4e56b8b1d99706.zip |
Merge "Automatic versioning for Camera." into gb-ub-photos-carlsbad
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 18e4e5621..a3659d095 100644 --- a/Android.mk +++ b/Android.mk @@ -13,7 +13,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 @@ -23,4 +28,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)) |