Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95aaf6cc authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Add TCM support for apache-http stack"

parents a5721262 5d623554

Android.mk

+3 −2
Original line number Diff line number Diff line
@@ -705,7 +705,8 @@ framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES := \ 
	ext \

	framework \

	telephony-common \

	voip-common

	voip-common \

        tcmiface



framework_docs_LOCAL_JAVA_LIBRARIES := \

	$(framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES) \
@@ -1048,7 +1049,7 @@ include $(CLEAR_VARS) 
LOCAL_SRC_FILES := $(ext_src_files)



LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES := core-libart

LOCAL_JAVA_LIBRARIES := core-libart tcmiface

LOCAL_JAVA_RESOURCE_DIRS := $(ext_res_dirs)

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE := ext

services/java/com/android/server/SystemServer.java

+1 −1
Original line number Diff line number Diff line
@@ -1255,7 +1255,7 @@ public final class SystemServer { 
            int dpmFeature = SystemProperties.getInt("persist.dpm.feature", 0);

            Slog.i(TAG, "DPM configuration set to " + dpmFeature);



            if (dpmFeature > 0 && dpmFeature < 8) {

            if (dpmFeature > 0 && dpmFeature < 16) {

                PathClassLoader dpmClassLoader =

                    new PathClassLoader("/system/framework/com.qti.dpmframework.jar",

                            ClassLoader.getSystemClassLoader());