diff options
| author | Ying Wang <wangying@google.com> | 2010-09-30 11:28:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-30 11:28:00 -0700 |
| commit | 1f28e33234084595d3fe859ed24f9842326cdcfb (patch) | |
| tree | f06a710dd29f9a73bc1203509692dca146e614c6 /Android.mk | |
| parent | bbcde2775d229bb62b0177b5eda056e08aed80bc (diff) | |
| parent | b95db75bc5a867b9ae0453b1ab3f7cd3f3cf34b4 (diff) | |
| download | android_packages_apps_Email-1f28e33234084595d3fe859ed24f9842326cdcfb.tar.gz android_packages_apps_Email-1f28e33234084595d3fe859ed24f9842326cdcfb.tar.bz2 android_packages_apps_Email-1f28e33234084595d3fe859ed24f9842326cdcfb.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.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index ebf293424..104fa3e57 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, |