diff options
| author |   Ying Wang <wangying@google.com> | 2010-09-30 09:32:14 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2010-09-30 09:32:14 -0700 |
| commit | 7d849f8a2aeadb5b8a97b42fe5748dced3051126 (patch) | |
| tree | b68e5497972404db5d4b11389a0e8c39df8f4173 /java | |
| parent | 4d158dc2779ffff8c92a41f32e6885bd0f155fc3 (diff) | |
| parent | 2d6a0c68c29c94b492a93d06d072568d767c1e72 (diff) | |
| download | latinime-7d849f8a2aeadb5b8a97b42fe5748dced3051126.tar.gz latinime-7d849f8a2aeadb5b8a97b42fe5748dced3051126.tar.xz latinime-7d849f8a2aeadb5b8a97b42fe5748dced3051126.zip | |
am 2d6a0c68: Merge "Fix proguard flag file dependency." into gingerbread
Merge commit '2d6a0c68c29c94b492a93d06d072568d767c1e72' into gingerbread-plus-aosp
* commit '2d6a0c68c29c94b492a93d06d072568d767c1e72':
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) |