summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorIsaac Katzenelson <isaack@android.com>2012-09-14 14:53:06 -0700
committerIsaac Katzenelson <isaack@android.com>2012-09-14 14:53:06 -0700
commit63211efa1565b5dc171938740ba183302d0e46f3 (patch)
treeccf4e06224ad9cbbe0a7524f66f7d2efa0bdfdb2 /Android.mk
parent485eb6c3caa5ed5f72b3bc12edea66cc86913cc4 (diff)
downloadandroid_packages_apps_DeskClock-63211efa1565b5dc171938740ba183302d0e46f3.tar.gz
android_packages_apps_DeskClock-63211efa1565b5dc171938740ba183302d0e46f3.tar.bz2
android_packages_apps_DeskClock-63211efa1565b5dc171938740ba183302d0e46f3.zip
Merge clock to JB-MR1
Change-Id: Ic2b550adb16f593a037939b2d1a2d4f60f4c5a5d
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 5892f3525..1d6117f45 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,6 +4,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
+LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
LOCAL_SRC_FILES := $(call all-java-files-under, src)
@@ -11,7 +12,9 @@ LOCAL_PACKAGE_NAME := DeskClock
LOCAL_OVERRIDES_PACKAGES := AlarmClock
-LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := 16
+
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
include $(BUILD_PACKAGE)