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

Commit 0f5ad294 authored by Amit Kumar's avatar Amit Kumar
Browse files

Fix httpclient library path and exclude it in proguard 

Change-Id: I944febf4a9fe770b5545af05c8d00c111ea36577
parent f98e4cad

Android.mk

+4 −7
Original line number Diff line number Diff line
@@ -8,13 +8,6 @@ LOCAL_MODULE := settings-logtags 


include $(BUILD_STATIC_JAVA_LIBRARY)



include $(CLEAR_VARS)

LOCAL_MODULE := httpclient

LOCAL_SRC_FILES := httpclient-4.5.10.jar

LOCAL_MODULE_CLASS := JAVA_LIBRARIES

LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)

include $(BUILD_PREBUILT)



# Build the Settings APK

include $(CLEAR_VARS)
@@ -60,6 +53,10 @@ include frameworks/base/packages/SettingsLib/common.mk 


include $(BUILD_PACKAGE)



include $(CLEAR_VARS)

LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES:=httpclient:libs/httpclient-4.5.10.jar

include $(BUILD_MULTI_PREBUILT)



# Use the following include to make our test apk.

ifeq (,$(ONE_SHOT_MAKEFILE))

include $(call all-makefiles-under,$(LOCAL_PATH))

proguard.flags

+6 −0
Original line number Diff line number Diff line
@@ -41,3 +41,9 @@ 
    public static ** SEARCH_INDEX_DATA_PROVIDER;

    public static ** SUMMARY_PROVIDER_FACTORY;

}

-keep class org.apache.http.** { *; }

-keep class org.apache.** { *; }

-keepclassmembers class org.apache.http.** {*;}

-dontwarn org.apache.**

-dontwarn org.apache.http.**

-dontwarn org.apache.commons.**
 
 No newline at end of file