commit 788959e2d798da2d8a34cf89779421966d200f3d
author Sailesh Nepal <sail@google.com> Tue Jul 08 23:36:40 2014 -0700
committer Sailesh Nepal <sail@google.com> Wed Jul 09 09:58:35 2014 -0700
tree fb368613d5220be01b1ae0663e3c01596acb3045
parent 9d67f24b3101e21894610c8e4b74a71ecd018898

SIP Part 1, move sip code

This CL moves the SIP code to
sip/src/com/android/services/telephony/sip

Moving the SIP code helps with a couple of things:
  - remove legacy dependency on old telephony code
    (PhoneUtils, etc...)
  - separate SIP from the PSTN connection code which
    is very different from SIP code
  - get the code ready for a future move out of
    Telephony all together

Bug: 14999064
Change-Id: Id32de6517d31be4aa177b2764d5bac1e1f9851c2

Android.mk

diff --git a/Android.mk b/Android.mk
index 75c81ac..586709f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,8 +6,8 @@
 
 phone_common_dir := ../../apps/PhoneCommon
 
-src_dirs := src $(phone_common_dir)/src
-res_dirs := res $(phone_common_dir)/res
+src_dirs := src $(phone_common_dir)/src sip/src
+res_dirs := res $(phone_common_dir)/res sip/res
 
 LOCAL_JAVA_LIBRARIES := telephony-common voip-common ims-common
 LOCAL_STATIC_JAVA_LIBRARIES := \
@@ -23,14 +23,15 @@
 
 LOCAL_AAPT_FLAGS := \
     --auto-add-overlay \
-    --extra-packages com.android.phone.common
+    --extra-packages com.android.phone.common \
+    --extra-packages com.android.services.telephony.sip
 
 LOCAL_PACKAGE_NAME := TeleService
 
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := true
 
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags sip/proguard.flags
 
 include $(BUILD_PACKAGE)