zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove ndk_build from platform makefile.

Browse Source 
Webrtc used to support both platform build and ndk build in a single makefile.
However, ndk build should be done by gyp, no need to support ndk build in android
makefile, remove NDK_ROOT.

Change-Id: I73c4ab84cec9f4f2d75ec21a50e420f9b076fce4
This commit is contained in:
leozwang
2014-05-07 15:44:48 -07:00
parent 49b9845aea
commit d386a80716
14 changed files with 0 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Android.mk
View File

@ -44,9 +44,7 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_PRELINK_MODULE := false LOCAL_PRELINK_MODULE := false
ifndef NDK_ROOT
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
endif
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
@ -76,9 +74,7 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_PRELINK_MODULE := false LOCAL_PRELINK_MODULE := false
ifndef NDK_ROOT
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
endif
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

4
src/common_audio/resampler/Android.mk
View File

@ -41,7 +41,6 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_SHARED_LIBRARIES += libdl LOCAL_SHARED_LIBRARIES += libdl
ifndef NDK_ROOT
ifndef WEBRTC_STL ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
@ -50,8 +49,5 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14 LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif endif
else
LOCAL_SHARED_LIBRARIES += libstlport
endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

4
src/common_audio/signal_processing/Android.mk
View File

@ -80,7 +80,6 @@ LOCAL_SRC_FILES_arm64 += $(my_c_src)
LOCAL_SRC_FILES_x86_64 += $(my_c_src) LOCAL_SRC_FILES_x86_64 += $(my_c_src)
LOCAL_SRC_FILES_mips64 += $(my_c_src) LOCAL_SRC_FILES_mips64 += $(my_c_src)
ifndef NDK_ROOT
ifndef WEBRTC_STL ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
@ -89,8 +88,5 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14 LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif endif
else
LOCAL_SHARED_LIBRARIES += libstlport
endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

4
src/common_audio/vad/Android.mk
View File

@ -44,7 +44,6 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_SHARED_LIBRARIES += libdl LOCAL_SHARED_LIBRARIES += libdl
ifndef NDK_ROOT
ifndef WEBRTC_STL ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
@ -53,8 +52,5 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14 LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif endif
else
LOCAL_SHARED_LIBRARIES += libstlport
endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

8
src/modules/audio_coding/codecs/isac/fix/source/Android.mk
View File

@ -75,7 +75,6 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../../../../.. \ $(LOCAL_PATH)/../../../../../.. \
$(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include
ifndef NDK_ROOT
ifndef WEBRTC_STL ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
@ -84,9 +83,6 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14 LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif endif
else
LOCAL_SHARED_LIBRARIES += libstlport
endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
@ -120,7 +116,6 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../../../../.. \ $(LOCAL_PATH)/../../../../../.. \
$(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include
ifndef NDK_ROOT
ifndef WEBRTC_STL ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
@ -129,9 +124,6 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14 LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif endif
else
LOCAL_SHARED_LIBRARIES += libstlport
endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

4
src/modules/audio_coding/codecs/isac/fix/test/Android.mk
View File

@ -54,9 +54,6 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_MODULE:= webrtc_isac_test LOCAL_MODULE:= webrtc_isac_test
ifdef NDK_ROOT
include $(BUILD_EXECUTABLE)
else
ifndef WEBRTC_STL ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
@ -67,4 +64,3 @@ LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
LOCAL_SHARED_LIBRARIES := LOCAL_SHARED_LIBRARIES :=
endif endif
include $(BUILD_NATIVE_TEST) include $(BUILD_NATIVE_TEST)
endif

4
src/modules/audio_coding/codecs/isac/main/source/Android.mk
View File

@ -62,7 +62,6 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../../../../.. \ $(LOCAL_PATH)/../../../../../.. \
$(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include
ifndef NDK_ROOT
ifndef WEBRTC_STL ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
@ -71,8 +70,5 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14 LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif endif
else
LOCAL_SHARED_LIBRARIES += libstlport
endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

14
src/modules/audio_processing/Android.mk
View File

@ -61,7 +61,6 @@ LOCAL_SHARED_LIBRARIES := \
libcutils \ libcutils \
libdl libdl
ifndef NDK_ROOT
ifndef WEBRTC_STL ifndef WEBRTC_STL
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
else else
@ -69,9 +68,6 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14 LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif endif
else
LOCAL_SHARED_LIBRARIES += libstlport
endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
@ -118,10 +114,6 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_MODULE:= webrtc_apm_process_test LOCAL_MODULE:= webrtc_apm_process_test
ifdef NDK_ROOT
LOCAL_SHARED_LIBRARIES += libstlport
include $(BUILD_EXECUTABLE)
else
ifndef WEBRTC_STL ifndef WEBRTC_STL
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
else else
@ -130,7 +122,6 @@ LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif endif
include $(BUILD_NATIVE_TEST) include $(BUILD_NATIVE_TEST)
endif
# apm unit test app # apm unit test app
@ -179,10 +170,6 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_MODULE:= webrtc_apm_unit_test LOCAL_MODULE:= webrtc_apm_unit_test
ifdef NDK_ROOT
LOCAL_SHARED_LIBRARIES += libstlport
include $(BUILD_EXECUTABLE)
else
ifndef WEBRTC_STL ifndef WEBRTC_STL
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
else else
@ -191,4 +178,3 @@ LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif endif
include $(BUILD_NATIVE_TEST) include $(BUILD_NATIVE_TEST)
endif

4
src/modules/audio_processing/aec/Android.mk
View File

@ -46,7 +46,6 @@ LOCAL_SHARED_LIBRARIES := \
libdl libdl
ifndef NDK_ROOT
ifndef WEBRTC_STL ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
@ -55,8 +54,5 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14 LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif endif
else
LOCAL_SHARED_LIBRARIES += libstlport
endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

8
src/modules/audio_processing/aecm/Android.mk
View File

@ -46,7 +46,6 @@ LOCAL_SHARED_LIBRARIES := \
libcutils \ libcutils \
libdl libdl
ifndef NDK_ROOT
ifndef WEBRTC_STL ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
@ -55,9 +54,6 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14 LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif endif
else
LOCAL_SHARED_LIBRARIES += libstlport
endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
@ -89,7 +85,6 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../.. \ $(LOCAL_PATH)/../../.. \
$(LOCAL_PATH)/../../../common_audio/signal_processing/include $(LOCAL_PATH)/../../../common_audio/signal_processing/include
ifndef NDK_ROOT
ifndef WEBRTC_STL ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
@ -98,9 +93,6 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14 LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif endif
else
LOCAL_SHARED_LIBRARIES += libstlport
endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

4
src/modules/audio_processing/agc/Android.mk
View File

@ -40,7 +40,6 @@ LOCAL_SHARED_LIBRARIES := \
libcutils \ libcutils \
libdl libdl
ifndef NDK_ROOT
ifndef WEBRTC_STL ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
@ -49,8 +48,5 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14 LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif endif
else
LOCAL_SHARED_LIBRARIES += libstlport
endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

8
src/modules/audio_processing/ns/Android.mk
View File

@ -48,7 +48,6 @@ LOCAL_SHARED_LIBRARIES := \
libcutils \ libcutils \
libdl libdl
ifndef NDK_ROOT
ifndef WEBRTC_STL ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
@ -57,9 +56,6 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14 LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif endif
else
LOCAL_SHARED_LIBRARIES += libstlport
endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
@ -91,7 +87,6 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../.. \ $(LOCAL_PATH)/../../.. \
$(LOCAL_PATH)/../../../common_audio/signal_processing/include $(LOCAL_PATH)/../../../common_audio/signal_processing/include
ifndef NDK_ROOT
ifndef WEBRTC_STL ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
@ -100,9 +95,6 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14 LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif endif
else
LOCAL_SHARED_LIBRARIES += libstlport
endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
endif # ifeq ($(WEBRTC_BUILD_NEON_LIBS),true) endif # ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)

4
src/modules/audio_processing/utility/Android.mk
View File

@ -43,7 +43,6 @@ LOCAL_SHARED_LIBRARIES := \
libcutils \ libcutils \
libdl libdl
ifndef NDK_ROOT
ifndef WEBRTC_STL ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
@ -52,8 +51,5 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14 LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif endif
else
LOCAL_SHARED_LIBRARIES += libstlport
endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

4
src/system_wrappers/source/Android.mk
View File

@ -58,7 +58,6 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../interface \ $(LOCAL_PATH)/../interface \
$(LOCAL_PATH)/spreadsortlib $(LOCAL_PATH)/spreadsortlib
ifndef NDK_ROOT
ifndef WEBRTC_STL ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
@ -67,8 +66,5 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14 LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif endif
else
LOCAL_SHARED_LIBRARIES += libstlport
endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)