diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-10-26 06:56:35 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-26 06:56:35 +0000 |
commit | e1ce5311ac69a311e79376affe43046aa0dc787b (patch) | |
tree | d7e9c17332b4c741cd3115663626f3fd2e9c9cfb /webrtc/modules/audio_processing/intelligibility/Android.mk | |
parent | ff04884918f02e936e7a425ea2281dad9f3d9281 (diff) | |
parent | 7358fda399c8a3dccaf0120bb9cee89807c640bf (diff) | |
download | webrtc-e1ce5311ac69a311e79376affe43046aa0dc787b.tar.gz |
Merge changes from topic "instruction_set_replace"
* changes:
Convert to Android.bp
Remove WEBRTC_BUILD_NEON_LIBS
Include test makefile
Remove unused gnustl webrtc variants
Diffstat (limited to 'webrtc/modules/audio_processing/intelligibility/Android.mk')
-rw-r--r-- | webrtc/modules/audio_processing/intelligibility/Android.mk | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/webrtc/modules/audio_processing/intelligibility/Android.mk b/webrtc/modules/audio_processing/intelligibility/Android.mk deleted file mode 100644 index 265e580aeb..0000000000 --- a/webrtc/modules/audio_processing/intelligibility/Android.mk +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. -# -# Use of this source code is governed by a BSD-style license -# that can be found in the LICENSE file in the root of the source -# tree. An additional intellectual property rights grant can be found -# in the file PATENTS. All contributing project authors may -# be found in the AUTHORS file in the root of the source tree. - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -include $(LOCAL_PATH)/../../../../android-webrtc.mk - -LOCAL_ARM_MODE := arm -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := libwebrtc_intell -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_CPP_EXTENSION := .cc -LOCAL_SRC_FILES := \ - intelligibility_enhancer.cc \ - intelligibility_utils.cc \ - -# Flags passed to both C and C++ files. -LOCAL_CFLAGS := \ - $(MY_WEBRTC_COMMON_DEFS) - -LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) -LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) -LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) -LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64) -LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64) -LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64) - -LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS) -LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS) - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/../../../.. \ - -ifdef WEBRTC_STL -LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) -LOCAL_SDK_VERSION := 14 -LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) -endif - -include $(BUILD_STATIC_LIBRARY) |