summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuhao Zheng <yuhaozheng@google.com>2014-06-11 02:00:23 +0000
committerYuhao Zheng <yuhaozheng@google.com>2014-06-11 02:00:23 +0000
commitdeba639927618694aa92b987654f0279b7c7d3fa (patch)
tree6e30adbd6dd21d2949f6f899243466aa736f6dc8
parentd8346f660b2dbf9c0e9e6ee8af7a654d7abc40e9 (diff)
downloadksoap2-android-5.1.1_r33.tar.gz
Revert "ksoap2: update Android.mk to fix a runtime crash"android-wear-5.0.0_r1android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-release
This reverts commit d8346f660b2dbf9c0e9e6ee8af7a654d7abc40e9. Change-Id: I077895e52eacb38822ac184cff9d06b68a40143c
-rw-r--r--Android.mk10
1 files changed, 9 insertions, 1 deletions
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))