Merge "Fix proguard flags."

2010-03-02 09:35:56 -08:00
parent 52e8e647ab 36d9f32f07
commit 7805d352a8
3 changed files with 7 additions and 1 deletions
--- a/apps/BluetoothDebug/Android.mk
+++ b/apps/BluetoothDebug/Android.mk
@@ -10,4 +10,6 @@ LOCAL_JAVA_LIBRARIES :=
 LOCAL_PACKAGE_NAME := BluetoothDebug
 LOCAL_CERTIFICATE := platform

+LOCAL_PROGUARD_ENABLED := disabled
+
 include $(BUILD_PACKAGE)
--- a/apps/SdkSetup/Android.mk
+++ b/apps/SdkSetup/Android.mk
@@ -8,4 +8,6 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_PACKAGE_NAME := SdkSetup
 LOCAL_CERTIFICATE := platform

+LOCAL_PROGUARD_ENABLED := disabled
+
 include $(BUILD_PACKAGE)
--- a/samples/SimpleJNI/Android.mk
+++ b/samples/SimpleJNI/Android.mk
@@ -32,6 +32,8 @@ LOCAL_PACKAGE_NAME := SimpleJNI

 LOCAL_JNI_SHARED_LIBRARIES := libsimplejni

+LOCAL_PROGUARD_ENABLED := disabled
+
 include $(BUILD_PACKAGE)

 # ============================================================