summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2010-09-30 11:27:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-30 11:27:10 -0700
commit471006d796e3705e61dbaf8f5a1973ef8840dd82 (patch)
tree60dc3826651ffca7d02fc0df5dba181cb7f4d319 /Android.mk
parent26cd348b1b12d04839c551c9645c9b04376c3d07 (diff)
parent7e818fdc87f7036d6b977f6a0d9e92d8ddc1404d (diff)
downloadandroid_packages_wallpapers_MagicSmoke-471006d796e3705e61dbaf8f5a1973ef8840dd82.tar.gz
android_packages_wallpapers_MagicSmoke-471006d796e3705e61dbaf8f5a1973ef8840dd82.tar.bz2
android_packages_wallpapers_MagicSmoke-471006d796e3705e61dbaf8f5a1973ef8840dd82.zip
am 7e818fdc: Fix proguard flag file dependency.
Merge commit '7e818fdc87f7036d6b977f6a0d9e92d8ddc1404d' * commit '7e818fdc87f7036d6b977f6a0d9e92d8ddc1404d': 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 bbcd2b1..affd0a5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,7 +26,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) $(call all-renderscript-files-u
LOCAL_PACKAGE_NAME := MagicSmokeWallpapers
LOCAL_CERTIFICATE := shared
-LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
include $(BUILD_PACKAGE)