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

Commit 07fb1fe8 authored by Dan Pasanen's avatar Dan Pasanen
Browse files

Merge tag 'android-7.1.1_r4' into cm-14.1 

Android 7.1.1 release 4

Change-Id: Iea35f4475c0a516cad797003e7101dd3d0c6711c
parents ff5ecfb6 86dd3d22

Android.mk

+11 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ include $(CLEAR_VARS) 
LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/src/java

LOCAL_SRC_FILES := $(call all-java-files-under, src/java) \

	$(call all-Iaidl-files-under, src/java) \

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

	$(call all-logtags-files-under, src/java) \

	$(call all-proto-files-under, proto)



LOCAL_JAVA_LIBRARIES := voip-common ims-common telephony-ext

LOCAL_STATIC_JAVA_LIBRARIES := ims-ext-common
@@ -33,6 +34,15 @@ endif 


LOCAL_MODULE_TAGS := optional

LOCAL_MODULE := telephony-common

LOCAL_PROTOC_OPTIMIZE_TYPE := nano

LOCAL_PROTO_JAVA_OUTPUT_PARAMS := optional_field_style=accessors,store_unknown_fields=true,enum_style=java



LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/jarjar-rules.txt



ifeq ($(EMMA_INSTRUMENT_FRAMEWORK),true)

LOCAL_EMMA_INSTRUMENT := true

endif



include $(BUILD_JAVA_LIBRARY)

jarjar-rules.txt

0 → 100644
+2 −0
Original line number Diff line number Diff line 
rule com.google.protobuf.nano.** com.android.framework.protobuf.nano.@1