summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2010-09-30 18:27:49 (GMT)
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-30 18:27:49 (GMT)
commit7c8c8478ba0c24c52519e75b45d320964c03cd61 (patch)
treea015a9116356cd43f1e174893e299e1a23cbbcb1 /Android.mk
parent60587efe1a60ed698db9e2cafcd48f2c3fc8aa40 (diff)
parentb159e77b99883125831eeded394c160b0637f93b (diff)
downloadandroid_packages_apps_Trebuchet-7c8c8478ba0c24c52519e75b45d320964c03cd61.zip
android_packages_apps_Trebuchet-7c8c8478ba0c24c52519e75b45d320964c03cd61.tar.gz
android_packages_apps_Trebuchet-7c8c8478ba0c24c52519e75b45d320964c03cd61.tar.bz2
am b159e77b: Fix proguard flag file dependency.
Merge commit 'b159e77b99883125831eeded394c160b0637f93b' * commit 'b159e77b99883125831eeded394c160b0637f93b': Fix proguard flag file dependency.
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index dfe6788..89e626b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,7 +30,7 @@ LOCAL_CERTIFICATE := shared
LOCAL_OVERRIDES_PACKAGES := Home
-LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
include $(BUILD_PACKAGE)