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

Commit 651e20d7 authored by Vara Prasad A V S G's avatar Vara Prasad A V S G
Browse files

Merge commit '819bbf1e' into remote 

Conflicts:
	res/values/config.xml

Change-Id: I33a1ff8eb9d1a6978dc304cef0d8b0d3be699cb0
parents 3c5d9d21 f15c62d6

Android.mk

+12 −1
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_SRC_FILES := \

        $(call all-logtags-files-under, src)



LOCAL_MODULE := settings-logtags



include $(BUILD_STATIC_JAVA_LIBRARY)



# Build the Settings APK

include $(CLEAR_VARS)



LOCAL_JAVA_LIBRARIES := bouncycastle core-oj telephony-common ims-common

LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-v4 \
@@ -9,7 +19,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    android-support-v7-preference \

    android-support-v7-appcompat \

    android-support-v14-preference \

    jsr305

    jsr305 \

    settings-logtags



LOCAL_MODULE_TAGS := optional