summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2010-02-19 18:47:49 -0800
committerYing Wang <wangying@google.com>2010-03-02 09:36:33 -0800
commitc882ddacc8b3085a51f8ae18d89d8fd1d055141f (patch)
treea0dc4328f367ebd4ff70eb150feb1e53eb924ccb
parent43242d02e931c116d7f334cda2b0d677bedfdd97 (diff)
Fix Proguard flags.
-rw-r--r--common/tests/Android.mk2
-rw-r--r--packages/TtsService/Android.mk2
-rw-r--r--packages/TtsService/proguard.flags5
-rw-r--r--tests/LotsOfApps/Android.mk2
-rw-r--r--tests/backup/Android.mk2
5 files changed, 13 insertions, 0 deletions
diff --git a/common/tests/Android.mk b/common/tests/Android.mk
index 0f2c3e4688df..74255521ddc7 100644
--- a/common/tests/Android.mk
+++ b/common/tests/Android.mk
@@ -23,4 +23,6 @@ LOCAL_SDK_VERSION := current
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_JAVA_LIBRARIES := android-common
+LOCAL_PROGUARD_ENABLED := disabled
+
include $(BUILD_PACKAGE)
diff --git a/packages/TtsService/Android.mk b/packages/TtsService/Android.mk
index 5eb6b9c102d8..75b26a245ed3 100644
--- a/packages/TtsService/Android.mk
+++ b/packages/TtsService/Android.mk
@@ -8,6 +8,8 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) \
LOCAL_PACKAGE_NAME := TtsService
LOCAL_CERTIFICATE := platform
+LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags
+
include $(BUILD_PACKAGE)
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/packages/TtsService/proguard.flags b/packages/TtsService/proguard.flags
new file mode 100644
index 000000000000..e8bee6b8b0e8
--- /dev/null
+++ b/packages/TtsService/proguard.flags
@@ -0,0 +1,5 @@
+-keep class android.tts.SynthProxy {
+ int mJniData;
+ # keep all declarations for native methods
+ <methods>;
+}
diff --git a/tests/LotsOfApps/Android.mk b/tests/LotsOfApps/Android.mk
index 8d0cfa3c75c8..0ef9550b8084 100644
--- a/tests/LotsOfApps/Android.mk
+++ b/tests/LotsOfApps/Android.mk
@@ -8,4 +8,6 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_PACKAGE_NAME := LotsOfApps
LOCAL_CERTIFICATE := platform
+LOCAL_PROGUARD_ENABLED := disabled
+
include $(BUILD_PACKAGE)
diff --git a/tests/backup/Android.mk b/tests/backup/Android.mk
index 498ec405d5fc..31e2ec5263b3 100644
--- a/tests/backup/Android.mk
+++ b/tests/backup/Android.mk
@@ -40,5 +40,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_PACKAGE_NAME := BackupTest
+LOCAL_PROGUARD_ENABLED := disabled
+
include $(BUILD_PACKAGE)