generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up ANDROID macro definitions [common_video]

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/91005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@260 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
leozwang@google.com 2011-07-26 21:22:27 +00:00
parent aace5b6bac
commit fa23ea123f
2 changed files with 20 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/common_video/jpeg/main/source/Android.mk
View File

@ -14,41 +14,28 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_MODULE := libwebrtc_jpeg LOCAL_MODULE := libwebrtc_jpeg
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CPP_EXTENSION := .cc LOCAL_CPP_EXTENSION := .cc
LOCAL_GENERATED_SOURCES := LOCAL_SRC_FILES := \
LOCAL_SRC_FILES := jpeg.cc \ jpeg.cc \
data_manager.cc data_manager.cc
# Flags passed to both C and C++ files. # Flags passed to both C and C++ files.
MY_CFLAGS := LOCAL_CFLAGS := \
MY_CFLAGS_C := $(MY_WEBRTC_COMMON_DEFS)
MY_DEFS := '-DNO_TCMALLOC' \
'-DNO_HEAPCHECKER'
ifeq ($(TARGET_ARCH),arm)
MY_DEFS += \
'-DWEBRTC_ANDROID' \
'-DANDROID'
endif
LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS)
# Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES := \
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../.. \
$(LOCAL_PATH)/../interface \ $(LOCAL_PATH)/../interface \
$(LOCAL_PATH)/../../../../../../ \ $(LOCAL_PATH)/../../../.. \
$(LOCAL_PATH)/../../../vplib/main/interface \ $(LOCAL_PATH)/../../../vplib/main/interface \
$(LOCAL_PATH)/../../../interface \ $(LOCAL_PATH)/../../../interface \
$(LOCAL_PATH)/../../../../../../ \
external/jpeg external/jpeg
# Flags passed to only C++ (and not C) files. LOCAL_SHARED_LIBRARIES := \
LOCAL_CPPFLAGS := libcutils \
LOCAL_LDFLAGS :=
LOCAL_STATIC_LIBRARIES :=
LOCAL_SHARED_LIBRARIES := libcutils \
libdl \ libdl \
libstlport libstlport
LOCAL_ADDITIONAL_DEPENDENCIES :=
ifndef NDK_ROOT
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

32
src/common_video/vplib/main/source/Android.mk
View File

@ -14,40 +14,26 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_MODULE := libwebrtc_vplib LOCAL_MODULE := libwebrtc_vplib
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CPP_EXTENSION := .cc LOCAL_CPP_EXTENSION := .cc
LOCAL_GENERATED_SOURCES :=
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
vplib.cc \ vplib.cc \
interpolator.cc \ interpolator.cc \
scale_bilinear_yuv.cc scale_bilinear_yuv.cc
# Flags passed to both C and C++ files. # Flags passed to both C and C++ files.
MY_CFLAGS := LOCAL_CFLAGS := \
MY_CFLAGS_C := $(MY_WEBRTC_COMMON_DEFS)
MY_DEFS := '-DNO_TCMALLOC' \
'-DNO_HEAPCHECKER' \
'-DWEBRTC_TARGET_PC' \
'-DWEBRTC_LINUX' \
'-DWEBRTC_THREAD_RR' \
'-DWEBRTC_ANDROID' \
'-DANDROID'
LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS)
# Include paths placed before CFLAGS/CPPFLAGS # Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../.. \ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../interface $(LOCAL_PATH)/../interface \
$(LOCAL_PATH)/../../../.. \
# Flags passed to only C++ (and not C) files. LOCAL_SHARED_LIBRARIES := \
LOCAL_CPPFLAGS := libcutils \
LOCAL_LDFLAGS :=
LOCAL_STATIC_LIBRARIES :=
LOCAL_SHARED_LIBRARIES := libcutils \
libdl \ libdl \
libstlport libstlport
LOCAL_ADDITIONAL_DEPENDENCIES :=
ifndef NDK_ROOT
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)