commit deba639927618694aa92b987654f0279b7c7d3fa
author Yuhao Zheng <yuhaozheng@google.com> Wed Jun 11 02:00:23 2014 +0000
committer Yuhao Zheng <yuhaozheng@google.com> Wed Jun 11 02:00:23 2014 +0000
tree 6e30adbd6dd21d2949f6f899243466aa736f6dc8
parent d8346f660b2dbf9c0e9e6ee8af7a654d7abc40e9

Revert "ksoap2: update Android.mk to fix a runtime crash"

This reverts commit d8346f660b2dbf9c0e9e6ee8af7a654d7abc40e9.

Change-Id: I077895e52eacb38822ac184cff9d06b68a40143c

Android.mk

diff --git a/Android.mk b/Android.mk
index 46c3493..f9c9008 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,9 +1,17 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
+LOCAL_MODULE_TAGS := optional
+
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
+#LOCAL_JAVA_STATIC_LIBRARIES := android-common
+#LOCAL_JAVA_LIBRARIES := android.common
+
 LOCAL_MODULE := ksoap2
 LOCAL_JAVA_LIBRARIES := okhttp
-include $(BUILD_JAVA_LIBRARY)
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+# additionally, build unit tests in a separate .apk
+include $(call all-makefiles-under,$(LOCAL_PATH))