aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2010-09-29 16:12:41 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-09-29 16:12:41 -0700
commit2d6a0c68c29c94b492a93d06d072568d767c1e72 (patch)
treeb68e5497972404db5d4b11389a0e8c39df8f4173 /java
parent15b840cd48184fc33b294c15eaaf28ac05393a43 (diff)
parentbdfcb664f4167c60f0241a4cdf87ad3c2e63027d (diff)
downloadlatinime-2d6a0c68c29c94b492a93d06d072568d767c1e72.tar.gz
latinime-2d6a0c68c29c94b492a93d06d072568d767c1e72.tar.xz
latinime-2d6a0c68c29c94b492a93d06d072568d767c1e72.zip
Merge "Fix proguard flag file dependency." into gingerbread
Diffstat (limited to 'java')
-rw-r--r--java/Android.mk2
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)