diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-25 08:22:02 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-25 08:22:02 +0000 |
commit | 2a567896a42c0dac570d428ba9c8781acbb7c0fe (patch) | |
tree | af20a3ad7e2953a7c05f622038296f0d5ddc2ad1 | |
parent | ba430240a75b37b39dbc21f4789d5b0638dbf367 (diff) | |
parent | 2ce9e1544377e36cd9a03a9d7aa809911aa735a3 (diff) | |
download | voip-pie-platform-release.tar.gz |
Snap for 4620899 from 2ce9e1544377e36cd9a03a9d7aa809911aa735a3 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-release
Change-Id: If6d375d9186833abc4442e6b3467f690bd96feb3
-rw-r--r-- | Android.bp | 41 | ||||
-rw-r--r-- | Android.mk | 36 | ||||
-rw-r--r-- | src/jni/rtp/Android.bp | 54 | ||||
-rw-r--r-- | src/jni/rtp/Android.mk | 58 |
4 files changed, 95 insertions, 94 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..0428c01 --- /dev/null +++ b/Android.bp @@ -0,0 +1,41 @@ +// Copyright 2010 Google Inc. All rights reserved. +// +// 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. + +filegroup { + name: "opt-net-voip-srcs", + srcs: [ + "src/java/android/net/**/*.java", + ], +} + +filegroup { + name: "opt-net-voip-htmls", + srcs: [ + "src/java/android/net/**/*.html", + ], +} + +java_library { + name: "voip-common", + srcs: [ + "src/java/**/*.java", + "src/java/**/I*.aidl", + ], + aidl: { + local_include_dirs: [ + "src/java", + ], + }, + required: ["librtp_jni"], +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 35eaad2..0000000 --- a/Android.mk +++ /dev/null @@ -1,36 +0,0 @@ -# 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/src/jni/rtp/Android.bp b/src/jni/rtp/Android.bp new file mode 100644 index 0000000..bdd5071 --- /dev/null +++ b/src/jni/rtp/Android.bp @@ -0,0 +1,54 @@ +// Copyright 2010 Google Inc. All rights reserved. +// +// 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. + +cc_library_shared { + name: "librtp_jni", + srcs: [ + "AudioCodec.cpp", + "AudioGroup.cpp", + "EchoSuppressor.cpp", + "RtpStream.cpp", + "util.cpp", + "rtp_jni.cpp", + + "AmrCodec.cpp", + "G711Codec.cpp", + "GsmCodec.cpp", + ], + shared_libs: [ + "libnativehelper", + "libcutils", + "libutils", + "liblog", + "libaudioclient", + "libstagefright_amrnb_common", + ], + static_libs: [ + "libgsm", + "libstagefright_amrnbdec", + "libstagefright_amrnbenc", + ], + include_dirs: [ + "frameworks/av/media/libstagefright/codecs/amrnb/enc/src", + "frameworks/av/media/libstagefright/codecs/amrnb/dec/src", + ], + cflags: [ + "-fvisibility=hidden", + "-Wall", + "-Wextra", + //getInput() is deprecated but we want to continue to track the usage of it elsewhere + "-Wno-deprecated-declarations", + "-Werror", + ], +} diff --git a/src/jni/rtp/Android.mk b/src/jni/rtp/Android.mk deleted file mode 100644 index b564f1b..0000000 --- a/src/jni/rtp/Android.mk +++ /dev/null @@ -1,58 +0,0 @@ -# -# 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 \ - liblog \ - libaudioclient \ - 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 - -# getInput() is deprecated but we want to continue to track the usage of it elsewhere -LOCAL_CFLAGS += -fvisibility=hidden -Wall -Wextra -Wno-deprecated-declarations -Werror - -include $(BUILD_SHARED_LIBRARY) |