diff options
| author | Lalit Kansara <lkansara@codeaurora.org> | 2016-12-06 14:44:19 +0530 |
|---|---|---|
| committer | Lalit Kansara <lkansara@codeaurora.org> | 2016-12-06 14:44:19 +0530 |
| commit | 0f732c5a8b59fa71e1ace20337c03e623cd10d2b (patch) | |
| tree | 70ea1d7f95c95163848ce24e5beec4e717b6602a /Android.mk | |
| parent | a5d7faeb6a3ba74912e0f18d07ec1b6cd2600c3d (diff) | |
| parent | 86dd3d2269bc264138cc314b349864dfd8cb115a (diff) | |
| download | android_frameworks_opt_telephony-0f732c5a8b59fa71e1ace20337c03e623cd10d2b.tar.gz android_frameworks_opt_telephony-0f732c5a8b59fa71e1ace20337c03e623cd10d2b.tar.bz2 android_frameworks_opt_telephony-0f732c5a8b59fa71e1ace20337c03e623cd10d2b.zip | |
Merge commit '86dd3d2269bc264138cc314b349864dfd8cb115a' into remote
Conflicts:
src/java/android/telephony/SmsManager.java
src/java/com/android/internal/telephony/BaseCommands.java
src/java/com/android/internal/telephony/CommandsInterface.java
src/java/com/android/internal/telephony/GsmCdmaCallTracker.java
src/java/com/android/internal/telephony/GsmCdmaConnection.java
src/java/com/android/internal/telephony/GsmCdmaPhone.java
src/java/com/android/internal/telephony/IccProvider.java
src/java/com/android/internal/telephony/ImsSMSDispatcher.java
src/java/com/android/internal/telephony/InboundSmsHandler.java
src/java/com/android/internal/telephony/Phone.java
src/java/com/android/internal/telephony/PhoneInternalInterface.java
src/java/com/android/internal/telephony/RIL.java
src/java/com/android/internal/telephony/ServiceStateTracker.java
src/java/com/android/internal/telephony/TelephonyEventLog.java
src/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
src/java/com/android/internal/telephony/dataconnection/DcTracker.java
src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java
src/java/com/android/internal/telephony/test/SimulatedCommandsVerifier.java
src/java/com/android/internal/telephony/uicc/AdnRecord.java
src/java/com/android/internal/telephony/uicc/UiccController.java
tests/telephonytests/src/com/android/internal/telephony/GsmCdmaCallTrackerTest.java
tests/telephonytests/src/com/android/internal/telephony/ImsSMSDispatcherTest.java
tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java
tests/telephonytests/src/com/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
Change-Id: I353ccef1d324716b13196ff6b3a56a74e091de51
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index 80e44c51d..5de6ac1eb 100644 --- a/Android.mk +++ b/Android.mk @@ -22,12 +22,22 @@ 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 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) |