aboutsummaryrefslogtreecommitdiff
path: root/src/system_wrappers/source/Android.mk
diff options
context:
space:
mode:
Diffstat (limited to 'src/system_wrappers/source/Android.mk')
-rw-r--r--src/system_wrappers/source/Android.mk68
1 files changed, 31 insertions, 37 deletions
diff --git a/src/system_wrappers/source/Android.mk b/src/system_wrappers/source/Android.mk
index f8e406f995..575580a497 100644
--- a/src/system_wrappers/source/Android.mk
+++ b/src/system_wrappers/source/Android.mk
@@ -1,14 +1,21 @@
-# This file is generated by gyp; do not edit. This means you!
+# Copyright (c) 2011 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_MODULE_TAGS := optional
LOCAL_CPP_EXTENSION := .cc
-LOCAL_GENERATED_SOURCES :=
LOCAL_SRC_FILES := \
map.cc \
rw_lock_generic.cc \
@@ -16,8 +23,10 @@ LOCAL_SRC_FILES := \
aligned_malloc.cc \
atomic32.cc \
condition_variable.cc \
- cpu.cc \
+ cpu_no_op.cc \
cpu_features.cc \
+ cpu_features_arm.c \
+ cpu_info.cc \
critical_section.cc \
event.cc \
file_impl.cc \
@@ -25,43 +34,28 @@ LOCAL_SRC_FILES := \
rw_lock.cc \
thread.cc \
trace_impl.cc \
- condition_variable_linux.cc \
+ condition_variable_posix.cc \
cpu_linux.cc \
- critical_section_linux.cc \
- event_linux.cc \
- thread_linux.cc \
- trace_linux.cc \
- rw_lock_linux.cc
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS :=
-MY_CFLAGS_C :=
-MY_DEFS := '-DNO_TCMALLOC' \
- '-DNO_HEAPCHECKER' \
- '-DWEBRTC_TARGET_PC' \
- '-DWEBRTC_LINUX' \
- '-DWEBRTC_CLOCK_TYPE_REALTIME' \
- '-DWEBRTC_THREAD_RR' \
- '-DWEBRTC_ANDROID' \
- '-DANDROID'
-LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS)
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../.. \
- $(LOCAL_PATH)/spreadsortlib \
- $(LOCAL_PATH)/../interface
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS :=
-
-LOCAL_LDFLAGS :=
-
-LOCAL_STATIC_LIBRARIES :=
-
-LOCAL_SHARED_LIBRARIES := libcutils \
+ critical_section_posix.cc \
+ event_posix.cc \
+ thread_posix.cc \
+ trace_posix.cc \
+ rw_lock_posix.cc
+
+LOCAL_CFLAGS := \
+ $(MY_WEBRTC_COMMON_DEFS)
+
+LOCAL_C_INCLUDES := \
+ $(LOCAL_PATH)/../.. \
+ $(LOCAL_PATH)/../interface \
+ $(LOCAL_PATH)/spreadsortlib
+
+LOCAL_SHARED_LIBRARIES := \
+ libcutils \
libdl \
libstlport
-LOCAL_ADDITIONAL_DEPENDENCIES :=
+ifndef NDK_ROOT
include external/stlport/libstlport.mk
+endif
include $(BUILD_STATIC_LIBRARY)