diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-10-19 22:50:11 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-10-19 22:50:11 +0000 |
| commit | e4b7614422621dbf83825717f5fe06b21a53fd3d (patch) | |
| tree | 701d167161f14f3dba1f0111999ba4d7115f9873 /webrtc_common.target.linux-mips.mk | |
| parent | c34187f7b7dd48bd316bebad20b05a4a8fd4503b (diff) | |
| download | webrtc-e4b7614422621dbf83825717f5fe06b21a53fd3d.tar.gz | |
Update makefiles after merge of Chromium at 89b463ddd92b
This commit was generated by merge_from_chromium.py.
Change-Id: Ib4f1a99ca57b985be94ad5094d09418dc048e66a
Diffstat (limited to 'webrtc_common.target.linux-mips.mk')
| -rw-r--r-- | webrtc_common.target.linux-mips.mk | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/webrtc_common.target.linux-mips.mk b/webrtc_common.target.linux-mips.mk index cf90fea9..ec954990 100644 --- a/webrtc_common.target.linux-mips.mk +++ b/webrtc_common.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_webrtc_common_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +LOCAL_SDK_VERSION := 19 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) @@ -113,10 +114,7 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ - $(LOCAL_PATH)/third_party \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party # Flags passed to only C++ (and not C) files. @@ -221,10 +219,7 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ - $(LOCAL_PATH)/third_party \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party # Flags passed to only C++ (and not C) files. @@ -247,13 +242,9 @@ LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CO LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - ### Set directly by aosp_build_settings. LOCAL_CLANG := false +LOCAL_NDK_STL_VARIANT := stlport_static # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules |