diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-10-26 07:09:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-26 07:09:59 +0000 |
| commit | 781e814fcb3aabbaa48520218710ea1e2093ef3d (patch) | |
| tree | d7e9c17332b4c741cd3115663626f3fd2e9c9cfb /webrtc/system_wrappers/source/Android.mk | |
| parent | 9e250bed196cb960855ee7dbac8cf9a35031b03c (diff) | |
| parent | a3f42b7dc93a03d1995e2d2741bb4b1b73e17239 (diff) | |
| download | webrtc-781e814fcb3aabbaa48520218710ea1e2093ef3d.tar.gz | |
Merge changes from topic "instruction_set_replace" am: e1ce5311ac am: ff3826d382
am: a3f42b7dc9
Change-Id: If979a9ee89e02cb5c2c79e93e54d7ec69c257bd9
Diffstat (limited to 'webrtc/system_wrappers/source/Android.mk')
| -rw-r--r-- | webrtc/system_wrappers/source/Android.mk | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/webrtc/system_wrappers/source/Android.mk b/webrtc/system_wrappers/source/Android.mk deleted file mode 100644 index c63c47b37c..0000000000 --- a/webrtc/system_wrappers/source/Android.mk +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright (c) 2012 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 := libwebrtc_system_wrappers -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_CPP_EXTENSION := .cc -LOCAL_SRC_FILES := \ - cpu_features_android.c \ - sort.cc \ - aligned_malloc.cc \ - atomic32_posix.cc \ - condition_variable.cc \ - cpu_features.cc \ - cpu_info.cc \ - critical_section.cc \ - event.cc \ - file_impl.cc \ - logging.cc \ - metrics_default.cc \ - rw_lock.cc \ - trace_impl.cc \ - condition_variable_posix.cc \ - critical_section_posix.cc \ - sleep.cc \ - trace_posix.cc \ - rw_lock_posix.cc \ - -LOCAL_CFLAGS := $(MY_WEBRTC_COMMON_DEFS) -LOCAL_CPPFLAGS := -std=c++0x - -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) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/android \ - $(LOCAL_PATH)/../../.. \ - $(LOCAL_PATH)/../interface \ - $(LOCAL_PATH)/spreadsortlib - -LOCAL_WHOLE_STATIC_LIBRARIES += cpufeatures - -include $(BUILD_STATIC_LIBRARY) |