diff options
| author | Ying Wang <wangying@google.com> | 2010-09-30 11:27:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-30 11:27:47 -0700 |
| commit | 4f4870f0bb7009e6d974b5d2c371924214684735 (patch) | |
| tree | 194601c33310845d8a29907833ba484eaae6ec0c | |
| parent | 0cf6418e090764b6880f5a8af19e8f7f7fc41858 (diff) | |
| parent | 3b197dfc7f90b5b7b65cbf7e62a13b088ef416d6 (diff) | |
| download | frameworks_base-4f4870f0bb7009e6d974b5d2c371924214684735.zip frameworks_base-4f4870f0bb7009e6d974b5d2c371924214684735.tar.gz frameworks_base-4f4870f0bb7009e6d974b5d2c371924214684735.tar.bz2 | |
am 3b197dfc: am 3caaa64e: Merge "Fix proguard flag file dependency." into gingerbread
Merge commit '3b197dfc7f90b5b7b65cbf7e62a13b088ef416d6'
* commit '3b197dfc7f90b5b7b65cbf7e62a13b088ef416d6':
Fix proguard flag file dependency.
| -rw-r--r-- | packages/TtsService/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/TtsService/Android.mk b/packages/TtsService/Android.mk index 75b26a2..a1a3b9f 100644 --- a/packages/TtsService/Android.mk +++ b/packages/TtsService/Android.mk @@ -8,7 +8,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) \ LOCAL_PACKAGE_NAME := TtsService LOCAL_CERTIFICATE := platform -LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags +LOCAL_PROGUARD_FLAG_FILES := proguard.flags include $(BUILD_PACKAGE) |