diff options
| author |   Ying Wang <wangying@google.com> | 2010-09-30 11:28:06 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2010-09-30 11:28:06 -0700 |
| commit | 4852f1a72e68b57f53c6f5a0cb4037efbbe36f90 (patch) | |
| tree | e9c9dc30bf6a669872932c2e9e230603e874403d /java | |
| parent | d2a74e9f16ddd2e76f03fdb9da802c48ec37fac8 (diff) | |
| parent | 7d849f8a2aeadb5b8a97b42fe5748dced3051126 (diff) | |
| download | latinime-4852f1a72e68b57f53c6f5a0cb4037efbbe36f90.tar.gz latinime-4852f1a72e68b57f53c6f5a0cb4037efbbe36f90.tar.xz latinime-4852f1a72e68b57f53c6f5a0cb4037efbbe36f90.zip | |
am 7d849f8a: am 2d6a0c68: Merge "Fix proguard flag file dependency." into gingerbread
Merge commit '7d849f8a2aeadb5b8a97b42fe5748dced3051126'
* commit '7d849f8a2aeadb5b8a97b42fe5748dced3051126':
Fix proguard flag file dependency.
Diffstat (limited to 'java')
| -rw-r--r-- | java/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/Android.mk b/java/Android.mk index e966fc7f3..03d48aaa7 100644 --- a/java/Android.mk +++ b/java/Android.mk @@ -17,6 +17,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-common LOCAL_SDK_VERSION := current -LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags +LOCAL_PROGUARD_FLAG_FILES := proguard.flags include $(BUILD_PACKAGE) |