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

Commit 3fe0578e authored by Jack Yu's avatar Jack Yu
Browse files

resolve merge conflicts of 5a5f4877 to master 

Test: runtest -x frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/metrics

Change-Id: Iea22620acd4efb0af845760544e00840014af4fb
parents 8fb8bebd 5a5f4877

Android.mk

+7 −1
Original line number Diff line number Diff line
@@ -22,11 +22,17 @@ 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

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

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