diff options
author | Ying Wang <wangying@google.com> | 2010-09-30 11:28:08 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-30 11:28:08 -0700 |
commit | 2aab1830f9be7e52b4c8dc47a4a412991cbbeff1 (patch) | |
tree | 45d11b32b7dfbdb46b35c324d74861ba58ecc542 /Android.mk | |
parent | a67dea9a107100f4276b527de91735ff0d06d92c (diff) | |
parent | 6bfed4c6aea63382d20ce613f22c90018164819a (diff) | |
download | android_packages_apps_Contacts-2aab1830f9be7e52b4c8dc47a4a412991cbbeff1.tar.gz android_packages_apps_Contacts-2aab1830f9be7e52b4c8dc47a4a412991cbbeff1.tar.bz2 android_packages_apps_Contacts-2aab1830f9be7e52b4c8dc47a4a412991cbbeff1.zip |
am 6bfed4c6: am f261e807: Fix proguard flag file dependency.
Merge commit '6bfed4c6aea63382d20ce613f22c90018164819a'
* commit '6bfed4c6aea63382d20ce613f22c90018164819a':
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 1bebf337d..ff1b7e25b 100644 --- a/Android.mk +++ b/Android.mk @@ -10,7 +10,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := com.android.phone.common com.android.vcard androi LOCAL_PACKAGE_NAME := Contacts LOCAL_CERTIFICATE := shared -LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags +LOCAL_PROGUARD_FLAG_FILES := proguard.flags include $(BUILD_PACKAGE) |