summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2010-09-30 11:28:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-30 11:28:00 -0700
commit0aeaf472994f4eb44ff0d26c1911ea2b2cce2221 (patch)
treea791fe9645d21827293719977eff8376777773d3 /Android.mk
parent7425e0b8966e8d1a85d56e338df642a5cbd47a96 (diff)
parent74988991e0518b4af215c818c63c64fcbed3d754 (diff)
downloadandroid_packages_apps_Exchange-0aeaf472994f4eb44ff0d26c1911ea2b2cce2221.tar.gz
android_packages_apps_Exchange-0aeaf472994f4eb44ff0d26c1911ea2b2cce2221.tar.bz2
android_packages_apps_Exchange-0aeaf472994f4eb44ff0d26c1911ea2b2cce2221.zip
am b95db75b: am b38a043e: Fix proguard flag file dependency.
Merge commit 'b95db75bc5a867b9ae0453b1ab3f7cd3f3cf34b4' * commit 'b95db75bc5a867b9ae0453b1ab3f7cd3f3cf34b4': 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 ebf29342..104fa3e5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,7 +30,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-common
LOCAL_PACKAGE_NAME := Email
-LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
# The Emma tool analyzes code coverage when running unit tests on the
# application. This configuration line selects which packages will be analyzed,