commit 48abe85fcb1891b4ec14458b288b75483c51395d
author Steve Kondik <steve@cyngn.com> Sat Nov 07 17:38:23 2015 -0800
committer Jackeagle <jackeagle102gmail.com> Sun Nov 13 23:36:37 2016 +0530
tree 1e00e470e6a59b5fb6c7596f8fbaa8bbc251ce3d
parent 88d6764f524b24a3baf5672980db8ec9790b3f90

okhttp: Get tcmiface off the boot classpath

Change-Id: I673812111ddf13e522df4447ec071a73ff762c29

Android.mk

diff --git a/Android.mk b/Android.mk
index 720f190..954bdce 100644
--- a/Android.mk
+++ b/Android.mk
@@ -48,7 +48,8 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(okhttp_system_src_files)
 LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
-LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt tcmiface
+LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt
+LOCAL_STATIC_JAVA_LIBRARIES := tcmiface
 LOCAL_NO_STANDARD_LIBRARIES := true
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_JAVA_LANGUAGE_VERSION := 1.7
@@ -60,7 +61,8 @@
 LOCAL_MODULE := okhttp-nojarjar
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(okhttp_system_src_files)
-LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt tcmiface
+LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt
+LOCAL_STATIC_JAVA_LIBRARIES := tcmiface
 LOCAL_NO_STANDARD_LIBRARIES := true
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_JAVA_LANGUAGE_VERSION := 1.7
@@ -82,7 +84,8 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(okhttp_system_src_files)
 LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
-LOCAL_JAVA_LIBRARIES := conscrypt-hostdex tcmiface-hostdex
+LOCAL_JAVA_LIBRARIES := conscrypt-hostdex
+LOCAL_STATIC_JAVA_LIBRARIES := tcmiface-hostdex
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_JAVA_LANGUAGE_VERSION := 1.7
 include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)

okhttp/src/main/java/com/squareup/okhttp/TcmIdleTimerMonitor.java

diff --git a/okhttp/src/main/java/com/squareup/okhttp/TcmIdleTimerMonitor.java b/okhttp/src/main/java/com/squareup/okhttp/TcmIdleTimerMonitor.java
index f23be28..4ccfd5f 100644
--- a/okhttp/src/main/java/com/squareup/okhttp/TcmIdleTimerMonitor.java
+++ b/okhttp/src/main/java/com/squareup/okhttp/TcmIdleTimerMonitor.java
@@ -66,7 +66,6 @@
       } catch (ClassNotFoundException e) {
         //Ignore ClassNotFound Exception
       } catch (Exception e) {
-        Platform.get().logW("tcmclient load failed: " + e);
       }
     }
   }