diff options
author | Wink Saville <wink@google.com> | 2013-01-28 15:27:06 -0800 |
---|---|---|
committer | Wink Saville <wink@google.com> | 2013-01-28 15:27:06 -0800 |
commit | d012595fd71a41159ec437d072f5dc56db8444a2 (patch) | |
tree | 9beb480ca228330a113f8f6851a530a72d61312c | |
parent | 39b6a9689d42cc61efa31dda02a9f14760c63ff4 (diff) | |
download | voip-d012595fd71a41159ec437d072f5dc56db8444a2.tar.gz |
Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip
Move the files down a level under src/, add Android.mk,
CleanSpec.mk and restore src/jni/rtp/Android.mk.
Change-Id: Ieaba759a0f69b45c4b8839cbed1fe757cdf190c5
-rw-r--r-- | Android.mk | 36 | ||||
-rw-r--r-- | CleanSpec.mk | 45 | ||||
-rw-r--r-- | src/java/android/net/rtp/AudioCodec.java (renamed from java/android/net/rtp/AudioCodec.java) | 0 | ||||
-rw-r--r-- | src/java/android/net/rtp/AudioGroup.java (renamed from java/android/net/rtp/AudioGroup.java) | 0 | ||||
-rw-r--r-- | src/java/android/net/rtp/AudioStream.java (renamed from java/android/net/rtp/AudioStream.java) | 0 | ||||
-rw-r--r-- | src/java/android/net/rtp/RtpStream.java (renamed from java/android/net/rtp/RtpStream.java) | 0 | ||||
-rw-r--r-- | src/java/android/net/rtp/package.html (renamed from java/android/net/rtp/package.html) | 0 | ||||
-rw-r--r-- | src/java/android/net/sip/ISipService.aidl (renamed from java/android/net/sip/ISipService.aidl) | 0 | ||||
-rw-r--r-- | src/java/android/net/sip/ISipSession.aidl (renamed from java/android/net/sip/ISipSession.aidl) | 0 | ||||
-rw-r--r-- | src/java/android/net/sip/ISipSessionListener.aidl (renamed from java/android/net/sip/ISipSessionListener.aidl) | 0 | ||||
-rw-r--r-- | src/java/android/net/sip/SimpleSessionDescription.java (renamed from java/android/net/sip/SimpleSessionDescription.java) | 0 | ||||
-rw-r--r-- | src/java/android/net/sip/SipAudioCall.java (renamed from java/android/net/sip/SipAudioCall.java) | 0 | ||||
-rw-r--r-- | src/java/android/net/sip/SipErrorCode.java (renamed from java/android/net/sip/SipErrorCode.java) | 0 | ||||
-rw-r--r-- | src/java/android/net/sip/SipException.java (renamed from java/android/net/sip/SipException.java) | 0 | ||||
-rw-r--r-- | src/java/android/net/sip/SipManager.java (renamed from java/android/net/sip/SipManager.java) | 0 | ||||
-rw-r--r-- | src/java/android/net/sip/SipProfile.aidl (renamed from java/android/net/sip/SipProfile.aidl) | 0 | ||||
-rw-r--r-- | src/java/android/net/sip/SipProfile.java (renamed from java/android/net/sip/SipProfile.java) | 0 | ||||
-rw-r--r-- | src/java/android/net/sip/SipRegistrationListener.java (renamed from java/android/net/sip/SipRegistrationListener.java) | 0 | ||||
-rw-r--r-- | src/java/android/net/sip/SipSession.java (renamed from java/android/net/sip/SipSession.java) | 0 | ||||
-rw-r--r-- | src/java/android/net/sip/SipSessionAdapter.java (renamed from java/android/net/sip/SipSessionAdapter.java) | 0 | ||||
-rw-r--r-- | src/java/android/net/sip/package.html (renamed from java/android/net/sip/package.html) | 0 | ||||
-rw-r--r-- | src/java/com/android/server/sip/SipHelper.java (renamed from java/com/android/server/sip/SipHelper.java) | 0 | ||||
-rw-r--r-- | src/java/com/android/server/sip/SipService.java (renamed from java/com/android/server/sip/SipService.java) | 0 | ||||
-rw-r--r-- | src/java/com/android/server/sip/SipSessionGroup.java (renamed from java/com/android/server/sip/SipSessionGroup.java) | 0 | ||||
-rw-r--r-- | src/java/com/android/server/sip/SipSessionListenerProxy.java (renamed from java/com/android/server/sip/SipSessionListenerProxy.java) | 0 | ||||
-rw-r--r-- | src/java/com/android/server/sip/SipWakeLock.java (renamed from java/com/android/server/sip/SipWakeLock.java) | 0 | ||||
-rw-r--r-- | src/java/com/android/server/sip/SipWakeupTimer.java (renamed from java/com/android/server/sip/SipWakeupTimer.java) | 0 | ||||
-rw-r--r-- | src/jni/rtp/AmrCodec.cpp (renamed from jni/rtp/AmrCodec.cpp) | 0 | ||||
-rw-r--r-- | src/jni/rtp/Android.mk | 59 | ||||
-rw-r--r-- | src/jni/rtp/AudioCodec.cpp (renamed from jni/rtp/AudioCodec.cpp) | 0 | ||||
-rw-r--r-- | src/jni/rtp/AudioCodec.h (renamed from jni/rtp/AudioCodec.h) | 0 | ||||
-rw-r--r-- | src/jni/rtp/AudioGroup.cpp (renamed from jni/rtp/AudioGroup.cpp) | 0 | ||||
-rw-r--r-- | src/jni/rtp/EchoSuppressor.cpp (renamed from jni/rtp/EchoSuppressor.cpp) | 0 | ||||
-rw-r--r-- | src/jni/rtp/EchoSuppressor.h (renamed from jni/rtp/EchoSuppressor.h) | 0 | ||||
-rw-r--r-- | src/jni/rtp/G711Codec.cpp (renamed from jni/rtp/G711Codec.cpp) | 0 | ||||
-rw-r--r-- | src/jni/rtp/GsmCodec.cpp (renamed from jni/rtp/GsmCodec.cpp) | 0 | ||||
-rw-r--r-- | src/jni/rtp/RtpStream.cpp (renamed from jni/rtp/RtpStream.cpp) | 0 | ||||
-rw-r--r-- | src/jni/rtp/rtp_jni.cpp (renamed from jni/rtp/rtp_jni.cpp) | 0 | ||||
-rw-r--r-- | src/jni/rtp/util.cpp (renamed from jni/rtp/util.cpp) | 0 |
39 files changed, 140 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk new file mode 100644 index 0000000..35eaad2 --- /dev/null +++ b/Android.mk @@ -0,0 +1,36 @@ +# Copyright (C) 2011 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +LOCAL_PATH := $(call my-dir) + +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) + +#LOCAL_JAVA_LIBRARIES := telephony-common +LOCAL_JNI_SHARED_LIBRARIES := librtp_jni +LOCAL_REQUIRED_MODULES := librtp_jni + +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := voip-common + +include $(BUILD_JAVA_LIBRARY) + +# Include subdirectory makefiles +# ============================================================ +include $(call all-makefiles-under,$(LOCAL_PATH)/src/jni) + diff --git a/CleanSpec.mk b/CleanSpec.mk new file mode 100644 index 0000000..31916d3 --- /dev/null +++ b/CleanSpec.mk @@ -0,0 +1,45 @@ +# Copyright (C) 2011 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# If you don't need to do a full clean build but would like to touch +# a file or delete some intermediate files, add a clean step to the end +# of the list. These steps will only be run once, if they haven't been +# run before. +# +# E.g.: +# $(call add-clean-step, touch -c external/sqlite/sqlite3.h) +# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates) +# +# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with +# files that are missing or have been moved. +# +# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory. +# Use $(OUT_DIR) to refer to the "out" directory. +# +# If you need to re-do something that's already mentioned, just copy +# the command and add it to the bottom of the list. E.g., if a change +# that you made last week required touching a file and a change you +# made today requires touching the same file, just copy the old +# touch step and add it to the end of the list. +# +# ************************************************ +# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST +# ************************************************ + +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/voip_intermediates) + +# ************************************************ +# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST +# ************************************************ diff --git a/java/android/net/rtp/AudioCodec.java b/src/java/android/net/rtp/AudioCodec.java index 85255c8..85255c8 100644 --- a/java/android/net/rtp/AudioCodec.java +++ b/src/java/android/net/rtp/AudioCodec.java diff --git a/java/android/net/rtp/AudioGroup.java b/src/java/android/net/rtp/AudioGroup.java index 8faeb88..8faeb88 100644 --- a/java/android/net/rtp/AudioGroup.java +++ b/src/java/android/net/rtp/AudioGroup.java diff --git a/java/android/net/rtp/AudioStream.java b/src/java/android/net/rtp/AudioStream.java index 5cd1abc..5cd1abc 100644 --- a/java/android/net/rtp/AudioStream.java +++ b/src/java/android/net/rtp/AudioStream.java diff --git a/java/android/net/rtp/RtpStream.java b/src/java/android/net/rtp/RtpStream.java index b9d75cd..b9d75cd 100644 --- a/java/android/net/rtp/RtpStream.java +++ b/src/java/android/net/rtp/RtpStream.java diff --git a/java/android/net/rtp/package.html b/src/java/android/net/rtp/package.html index 4506b09..4506b09 100644 --- a/java/android/net/rtp/package.html +++ b/src/java/android/net/rtp/package.html diff --git a/java/android/net/sip/ISipService.aidl b/src/java/android/net/sip/ISipService.aidl index 3250bf9..3250bf9 100644 --- a/java/android/net/sip/ISipService.aidl +++ b/src/java/android/net/sip/ISipService.aidl diff --git a/java/android/net/sip/ISipSession.aidl b/src/java/android/net/sip/ISipSession.aidl index 2d515db..2d515db 100644 --- a/java/android/net/sip/ISipSession.aidl +++ b/src/java/android/net/sip/ISipSession.aidl diff --git a/java/android/net/sip/ISipSessionListener.aidl b/src/java/android/net/sip/ISipSessionListener.aidl index 690700c..690700c 100644 --- a/java/android/net/sip/ISipSessionListener.aidl +++ b/src/java/android/net/sip/ISipSessionListener.aidl diff --git a/java/android/net/sip/SimpleSessionDescription.java b/src/java/android/net/sip/SimpleSessionDescription.java index 9fcd21d..9fcd21d 100644 --- a/java/android/net/sip/SimpleSessionDescription.java +++ b/src/java/android/net/sip/SimpleSessionDescription.java diff --git a/java/android/net/sip/SipAudioCall.java b/src/java/android/net/sip/SipAudioCall.java index ea943e9..ea943e9 100644 --- a/java/android/net/sip/SipAudioCall.java +++ b/src/java/android/net/sip/SipAudioCall.java diff --git a/java/android/net/sip/SipErrorCode.java b/src/java/android/net/sip/SipErrorCode.java index 509728f..509728f 100644 --- a/java/android/net/sip/SipErrorCode.java +++ b/src/java/android/net/sip/SipErrorCode.java diff --git a/java/android/net/sip/SipException.java b/src/java/android/net/sip/SipException.java index 0339395..0339395 100644 --- a/java/android/net/sip/SipException.java +++ b/src/java/android/net/sip/SipException.java diff --git a/java/android/net/sip/SipManager.java b/src/java/android/net/sip/SipManager.java index a94232a..a94232a 100644 --- a/java/android/net/sip/SipManager.java +++ b/src/java/android/net/sip/SipManager.java diff --git a/java/android/net/sip/SipProfile.aidl b/src/java/android/net/sip/SipProfile.aidl index 3b6f68f..3b6f68f 100644 --- a/java/android/net/sip/SipProfile.aidl +++ b/src/java/android/net/sip/SipProfile.aidl diff --git a/java/android/net/sip/SipProfile.java b/src/java/android/net/sip/SipProfile.java index 0ef754c..0ef754c 100644 --- a/java/android/net/sip/SipProfile.java +++ b/src/java/android/net/sip/SipProfile.java diff --git a/java/android/net/sip/SipRegistrationListener.java b/src/java/android/net/sip/SipRegistrationListener.java index 9968cc7..9968cc7 100644 --- a/java/android/net/sip/SipRegistrationListener.java +++ b/src/java/android/net/sip/SipRegistrationListener.java diff --git a/java/android/net/sip/SipSession.java b/src/java/android/net/sip/SipSession.java index edbc66f..edbc66f 100644 --- a/java/android/net/sip/SipSession.java +++ b/src/java/android/net/sip/SipSession.java diff --git a/java/android/net/sip/SipSessionAdapter.java b/src/java/android/net/sip/SipSessionAdapter.java index f538983..f538983 100644 --- a/java/android/net/sip/SipSessionAdapter.java +++ b/src/java/android/net/sip/SipSessionAdapter.java diff --git a/java/android/net/sip/package.html b/src/java/android/net/sip/package.html index 3c4cc23..3c4cc23 100644 --- a/java/android/net/sip/package.html +++ b/src/java/android/net/sip/package.html diff --git a/java/com/android/server/sip/SipHelper.java b/src/java/com/android/server/sip/SipHelper.java index c708be8..c708be8 100644 --- a/java/com/android/server/sip/SipHelper.java +++ b/src/java/com/android/server/sip/SipHelper.java diff --git a/java/com/android/server/sip/SipService.java b/src/java/com/android/server/sip/SipService.java index 80fe68c..80fe68c 100644 --- a/java/com/android/server/sip/SipService.java +++ b/src/java/com/android/server/sip/SipService.java diff --git a/java/com/android/server/sip/SipSessionGroup.java b/src/java/com/android/server/sip/SipSessionGroup.java index e820f35..e820f35 100644 --- a/java/com/android/server/sip/SipSessionGroup.java +++ b/src/java/com/android/server/sip/SipSessionGroup.java diff --git a/java/com/android/server/sip/SipSessionListenerProxy.java b/src/java/com/android/server/sip/SipSessionListenerProxy.java index 7a4ae8d..7a4ae8d 100644 --- a/java/com/android/server/sip/SipSessionListenerProxy.java +++ b/src/java/com/android/server/sip/SipSessionListenerProxy.java diff --git a/java/com/android/server/sip/SipWakeLock.java b/src/java/com/android/server/sip/SipWakeLock.java index b3fbb56..b3fbb56 100644 --- a/java/com/android/server/sip/SipWakeLock.java +++ b/src/java/com/android/server/sip/SipWakeLock.java diff --git a/java/com/android/server/sip/SipWakeupTimer.java b/src/java/com/android/server/sip/SipWakeupTimer.java index 3ba4331..3ba4331 100644 --- a/java/com/android/server/sip/SipWakeupTimer.java +++ b/src/java/com/android/server/sip/SipWakeupTimer.java diff --git a/jni/rtp/AmrCodec.cpp b/src/jni/rtp/AmrCodec.cpp index e2d820e..e2d820e 100644 --- a/jni/rtp/AmrCodec.cpp +++ b/src/jni/rtp/AmrCodec.cpp diff --git a/src/jni/rtp/Android.mk b/src/jni/rtp/Android.mk new file mode 100644 index 0000000..b265cdd --- /dev/null +++ b/src/jni/rtp/Android.mk @@ -0,0 +1,59 @@ +# +# Copyright (C) 2010 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE := librtp_jni + +LOCAL_SRC_FILES := \ + AudioCodec.cpp \ + AudioGroup.cpp \ + EchoSuppressor.cpp \ + RtpStream.cpp \ + util.cpp \ + rtp_jni.cpp + +LOCAL_SRC_FILES += \ + AmrCodec.cpp \ + G711Codec.cpp \ + GsmCodec.cpp + +LOCAL_SHARED_LIBRARIES := \ + libnativehelper \ + libcutils \ + libutils \ + libmedia \ + libstagefright_amrnb_common + +LOCAL_STATIC_LIBRARIES := libgsm libstagefright_amrnbdec libstagefright_amrnbenc + +LOCAL_C_INCLUDES += \ + $(JNI_H_INCLUDE) \ + external/libgsm/inc \ + frameworks/av/media/libstagefright/codecs/amrnb/common/include \ + frameworks/av/media/libstagefright/codecs/amrnb/common/ \ + frameworks/av/media/libstagefright/codecs/amrnb/enc/include \ + frameworks/av/media/libstagefright/codecs/amrnb/enc/src \ + frameworks/av/media/libstagefright/codecs/amrnb/dec/include \ + frameworks/av/media/libstagefright/codecs/amrnb/dec/src \ + $(call include-path-for, audio-effects) + +LOCAL_CFLAGS += -fvisibility=hidden + + + +include $(BUILD_SHARED_LIBRARY) diff --git a/jni/rtp/AudioCodec.cpp b/src/jni/rtp/AudioCodec.cpp index c75fbc9..c75fbc9 100644 --- a/jni/rtp/AudioCodec.cpp +++ b/src/jni/rtp/AudioCodec.cpp diff --git a/jni/rtp/AudioCodec.h b/src/jni/rtp/AudioCodec.h index 741730b..741730b 100644 --- a/jni/rtp/AudioCodec.h +++ b/src/jni/rtp/AudioCodec.h diff --git a/jni/rtp/AudioGroup.cpp b/src/jni/rtp/AudioGroup.cpp index 2f0829e..2f0829e 100644 --- a/jni/rtp/AudioGroup.cpp +++ b/src/jni/rtp/AudioGroup.cpp diff --git a/jni/rtp/EchoSuppressor.cpp b/src/jni/rtp/EchoSuppressor.cpp index e223136..e223136 100644 --- a/jni/rtp/EchoSuppressor.cpp +++ b/src/jni/rtp/EchoSuppressor.cpp diff --git a/jni/rtp/EchoSuppressor.h b/src/jni/rtp/EchoSuppressor.h index 2f3b593..2f3b593 100644 --- a/jni/rtp/EchoSuppressor.h +++ b/src/jni/rtp/EchoSuppressor.h diff --git a/jni/rtp/G711Codec.cpp b/src/jni/rtp/G711Codec.cpp index ef54863..ef54863 100644 --- a/jni/rtp/G711Codec.cpp +++ b/src/jni/rtp/G711Codec.cpp diff --git a/jni/rtp/GsmCodec.cpp b/src/jni/rtp/GsmCodec.cpp index 61dfdc9..61dfdc9 100644 --- a/jni/rtp/GsmCodec.cpp +++ b/src/jni/rtp/GsmCodec.cpp diff --git a/jni/rtp/RtpStream.cpp b/src/jni/rtp/RtpStream.cpp index bfe8e24..bfe8e24 100644 --- a/jni/rtp/RtpStream.cpp +++ b/src/jni/rtp/RtpStream.cpp diff --git a/jni/rtp/rtp_jni.cpp b/src/jni/rtp/rtp_jni.cpp index 9f4bff9..9f4bff9 100644 --- a/jni/rtp/rtp_jni.cpp +++ b/src/jni/rtp/rtp_jni.cpp diff --git a/jni/rtp/util.cpp b/src/jni/rtp/util.cpp index 1d702fc..1d702fc 100644 --- a/jni/rtp/util.cpp +++ b/src/jni/rtp/util.cpp |